[Pkg-crosswire-commits] [bibletime] 01/06: Imported Upstream version 2.10.1

Roberto C. Sanchez roberto at moszumanska.debian.org
Wed Oct 22 03:41:30 UTC 2014


This is an automated email from the git hooks/post-receive script.

roberto pushed a commit to branch master
in repository bibletime.

commit 1ea03c0fce8066c1e22188447b4a6ca4dcef1201
Author: Roberto C. Sanchez <roberto at connexer.com>
Date:   Tue Oct 21 22:58:34 2014 -0400

    Imported Upstream version 2.10.1
---
 .gitattributes                                     |    7 -
 .gitignore                                         |   24 -
 CMakeLists.txt                                     |  469 +-
 ChangeLog                                          |   78 +-
 README                                             |    6 +-
 archive.sh                                         |   14 +-
 cmake/BTBinaryPackageMacOS.cmake                   |   49 +-
 cmake/BTBinaryPackageWindows.cmake                 |  112 +-
 cmake/BTDeveloper.cmake                            |   16 -
 cmake/BTDocumentation.cmake                        |    6 +-
 cmake/BTSourceFileList.cmake                       |  227 +-
 cmake/BTUITranslation.cmake                        |   41 +-
 cmake/FindCLucene.cmake                            |  176 +-
 cmake/FindGit.cmake                                |   70 -
 cmake/FindICU.cmake                                |   51 -
 cmake/FindSword.cmake                              |  259 +-
 ...hDebug.cmake => KDE4FindLibraryWithDebug.cmake} |    0
 cmake/platforms/linux/bibletime.desktop.cmake      |   16 +-
 cmake/platforms/macos/Info.plist                   |   16 +
 cmake/platforms/macos/bt_start.sh                  |   21 -
 cmake/platforms/windows/qt.conf                    |    2 +
 cmake/platforms/windows/rawfiles.cpp               |  228 +-
 cmake/platforms/windows/rawfiles.h                 |   94 +-
 cmake/sword_linker_check.cpp                       |   27 -
 ...version_compare.cpp => sword_version_print.cpp} |   13 +-
 docs/development/ksgmltools-bug-read-me.txt        |    2 +-
 docs/development/packaging-howto.txt               |   58 +-
 docs/development/trinitarian.formula.sh            |   50 +
 docs/handbook/ar/docbook/index.docbook             |   17 +-
 docs/handbook/ar/html/index.html                   |   11 +-
 docs/handbook/cs/docbook/index.docbook             |    9 +-
 docs/handbook/cs/html/index.html                   |    5 +-
 docs/handbook/cs/pdf/handbook.pdf                  |  Bin 384549 -> 384549 bytes
 docs/handbook/de/docbook/index.docbook             |   18 +-
 docs/handbook/de/html/index.html                   |   14 +-
 docs/handbook/de/pdf/handbook.pdf                  |  Bin 388356 -> 388311 bytes
 docs/handbook/en/docbook/index.docbook             |    8 +-
 docs/handbook/en/html/i_back.png                   |  Bin 1502 -> 1427 bytes
 docs/handbook/en/html/i_bible.png                  |  Bin 1547 -> 1496 bytes
 docs/handbook/en/html/i_bible_add.png              |  Bin 1662 -> 1611 bytes
 docs/handbook/en/html/i_bibletime.png              |  Bin 1571 -> 1536 bytes
 docs/handbook/en/html/i_book.png                   |  Bin 1528 -> 1482 bytes
 docs/handbook/en/html/i_book_add.png               |  Bin 1641 -> 1590 bytes
 docs/handbook/en/html/i_bookmark.png               |  Bin 1442 -> 1404 bytes
 docs/handbook/en/html/i_books.png                  |  Bin 1477 -> 1427 bytes
 docs/handbook/en/html/i_cascade.png                |  Bin 1516 -> 1382 bytes
 docs/handbook/en/html/i_checkbox.png               |  Bin 1462 -> 1403 bytes
 docs/handbook/en/html/i_commentary.png             |  Bin 1552 -> 1507 bytes
 docs/handbook/en/html/i_commentary_add.png         |  Bin 1647 -> 1603 bytes
 docs/handbook/en/html/i_configure.png              |  Bin 1302 -> 1255 bytes
 docs/handbook/en/html/i_configuresword.png         |  Bin 1524 -> 1475 bytes
 docs/handbook/en/html/i_contents2.png              |  Bin 1437 -> 1382 bytes
 docs/handbook/en/html/i_displayconfig.png          |  Bin 1578 -> 1531 bytes
 docs/handbook/en/html/i_document_magnifier.png     |  Bin 1523 -> 1469 bytes
 docs/handbook/en/html/i_exit.png                   |  Bin 1505 -> 1422 bytes
 docs/handbook/en/html/i_fileclose.png              |  Bin 945 -> 861 bytes
 docs/handbook/en/html/i_find.png                   |  Bin 1380 -> 1350 bytes
 docs/handbook/en/html/i_forward.png                |  Bin 1530 -> 1459 bytes
 docs/handbook/en/html/i_lexicon.png                |  Bin 1568 -> 1511 bytes
 docs/handbook/en/html/i_lexicon_add.png            |  Bin 1666 -> 1611 bytes
 docs/handbook/en/html/i_light_bulb.png             |  Bin 1328 -> 1292 bytes
 docs/handbook/en/html/i_sync.png                   |  Bin 1662 -> 1610 bytes
 docs/handbook/en/html/i_tile.png                   |  Bin 1515 -> 1432 bytes
 docs/handbook/en/html/i_tile_horiz.png             |  Bin 484 -> 415 bytes
 docs/handbook/en/html/i_tile_vert.png              |  Bin 477 -> 409 bytes
 docs/handbook/en/html/i_view_index.png             |  Bin 380 -> 313 bytes
 docs/handbook/en/html/i_window_fullscreen.png      |  Bin 968 -> 889 bytes
 docs/handbook/en/html/index.html                   |    4 +-
 docs/handbook/en/html/ss_configfonts.png           |  Bin 24858 -> 22491 bytes
 docs/handbook/en/html/ss_mainterms.png             |  Bin 95356 -> 90155 bytes
 docs/handbook/en/html/ss_searchanal.png            |  Bin 15920 -> 14117 bytes
 docs/handbook/en/html/ss_searchopts.png            |  Bin 44197 -> 39772 bytes
 docs/handbook/en/html/ss_shortcuts.png             |  Bin 25181 -> 23323 bytes
 docs/handbook/en/pdf/handbook.pdf                  |  Bin 384191 -> 384191 bytes
 docs/handbook/es/docbook/index.docbook             |   18 +-
 docs/handbook/es/html/index.html                   |   14 +-
 docs/handbook/es/pdf/handbook.pdf                  |  Bin 388190 -> 388166 bytes
 docs/handbook/fi/docbook/index.docbook             |    9 +-
 docs/handbook/fi/html/index.html                   |    5 +-
 docs/handbook/fi/pdf/handbook.pdf                  |  Bin 385169 -> 385165 bytes
 docs/handbook/fr/docbook/index.docbook             |   18 +-
 docs/handbook/fr/html/index.html                   |   12 +-
 docs/handbook/fr/pdf/handbook.pdf                  |  Bin 385429 -> 385401 bytes
 docs/handbook/hu/docbook/index.docbook             |   18 +-
 docs/handbook/hu/html/index.html                   |   12 +-
 docs/handbook/hu/pdf/handbook.pdf                  |  Bin 386072 -> 386009 bytes
 docs/handbook/it/docbook/index.docbook             |   18 +-
 docs/handbook/it/html/index.html                   |   14 +-
 docs/handbook/it/pdf/handbook.pdf                  |  Bin 385560 -> 385560 bytes
 docs/handbook/nl/docbook/index.docbook             |    9 +-
 docs/handbook/nl/html/index.html                   |    5 +-
 docs/handbook/nl/pdf/handbook.pdf                  |  Bin 385676 -> 385665 bytes
 docs/handbook/pt_BR/docbook/index.docbook          |   18 +-
 docs/handbook/pt_BR/html/index.html                |   12 +-
 docs/handbook/{nl => pt_BR}/pdf/handbook.pdf       |  Bin 385676 -> 385975 bytes
 docs/howto/ar/docbook/index.docbook                |    2 +-
 docs/howto/ar/html/index.html                      |    4 +-
 docs/howto/bg/docbook/index.docbook                |    2 +-
 docs/howto/bg/html/index.html                      |    4 +-
 docs/howto/cs/docbook/index.docbook                |    2 +-
 docs/howto/cs/html/index.html                      |    4 +-
 docs/howto/da/docbook/index.docbook                |    2 +-
 docs/howto/da/html/index.html                      |    4 +-
 docs/howto/de/docbook/index.docbook                |    2 +-
 docs/howto/de/html/index.html                      |    4 +-
 docs/howto/en/docbook/index.docbook                |    2 +-
 docs/howto/en/html/index.html                      |    2 +-
 docs/howto/es/docbook/index.docbook                |    2 +-
 docs/howto/es/html/index.html                      |    4 +-
 docs/howto/fi/docbook/index.docbook                |    2 +-
 docs/howto/fi/html/index.html                      |    4 +-
 docs/howto/fr/docbook/index.docbook                |    2 +-
 docs/howto/fr/html/index.html                      |    4 +-
 docs/howto/hu/docbook/index.docbook                |    2 +-
 docs/howto/hu/html/index.html                      |    4 +-
 docs/howto/it/docbook/index.docbook                |    2 +-
 docs/howto/it/html/index.html                      |    4 +-
 docs/howto/ko/docbook/index.docbook                |    2 +-
 docs/howto/ko/html/index.html                      |    4 +-
 docs/howto/nl/docbook/index.docbook                |    2 +-
 docs/howto/nl/html/index.html                      |    4 +-
 docs/howto/pt_BR/docbook/index.docbook             |    2 +-
 docs/howto/pt_BR/html/index.html                   |    4 +-
 docs/howto/ru/docbook/index.docbook                |    2 +-
 docs/howto/ru/html/index.html                      |    4 +-
 i18n/handbook/handbook-ar.po                       |   36 +-
 i18n/handbook/handbook-cs.po                       |   40 +-
 i18n/handbook/handbook-de.po                       |   43 +-
 i18n/handbook/handbook-es.po                       |   36 +-
 i18n/handbook/handbook-fi.po                       |   26 +-
 i18n/handbook/handbook-fr.po                       |   32 +-
 i18n/handbook/handbook-hu.po                       |   55 +-
 i18n/handbook/handbook-it.po                       |   45 +-
 i18n/handbook/handbook-nl.po                       |   26 +-
 i18n/handbook/handbook-pt_BR.po                    |   43 +-
 i18n/handbook/handbook.pot                         |   11 +-
 i18n/howto/howto-ar.po                             |    8 +-
 i18n/howto/howto-bg.po                             |    4 +-
 i18n/howto/howto-cs.po                             |    4 +-
 i18n/howto/howto-da.po                             |    4 +-
 i18n/howto/howto-de.po                             |    8 +-
 i18n/howto/howto-es.po                             |   26 +-
 i18n/howto/howto-fi.po                             |    4 +-
 i18n/howto/howto-fr.po                             |    8 +-
 i18n/howto/howto-hu.po                             |    4 +-
 i18n/howto/howto-it.po                             |    8 +-
 i18n/howto/howto-ko.po                             |    4 +-
 i18n/howto/howto-nl.po                             |    4 +-
 i18n/howto/howto-pt_BR.po                          |    4 +-
 i18n/howto/howto-ru.po                             |    4 +-
 i18n/howto/howto.pot                               |    4 +-
 i18n/messages/bibletime_ui.ts                      | 2188 ++++----
 i18n/messages/bibletime_ui_ar.ts                   | 2283 ++++----
 i18n/messages/bibletime_ui_cs.ts                   |  504 +-
 i18n/messages/bibletime_ui_da.ts                   | 2370 ++++-----
 i18n/messages/bibletime_ui_de.ts                   |  747 +--
 i18n/messages/bibletime_ui_en_GB.ts                | 2256 ++++----
 i18n/messages/bibletime_ui_es.ts                   | 2127 ++++----
 i18n/messages/bibletime_ui_et.ts                   | 2399 ++++-----
 i18n/messages/bibletime_ui_fi.ts                   | 2372 ++++-----
 i18n/messages/bibletime_ui_fr.ts                   | 5409 -------------------
 i18n/messages/bibletime_ui_hu.ts                   | 2121 ++++----
 i18n/messages/bibletime_ui_it.ts                   | 2573 ++++-----
 i18n/messages/bibletime_ui_nl.ts                   | 5432 --------------------
 i18n/messages/bibletime_ui_nn_NO.ts                | 5249 -------------------
 i18n/messages/bibletime_ui_pl.ts                   | 3644 ++++++-------
 i18n/messages/bibletime_ui_pt.ts                   | 2270 ++++----
 i18n/messages/bibletime_ui_pt_BR.ts                | 2153 ++++----
 i18n/messages/bibletime_ui_ro.ts                   | 5288 -------------------
 i18n/messages/bibletime_ui_ru.ts                   | 2261 ++++----
 i18n/messages/bibletime_ui_sk.ts                   | 3200 ++++++------
 i18n/messages/bibletime_ui_zh_CN.ts                | 5186 -------------------
 i18n/messages/bibletime_ui_zh_TW.ts                | 2328 ++++-----
 .../bookshelfmodel/btbookshelffiltermodel.cpp      |  158 +-
 .../bookshelfmodel/btbookshelffiltermodel.h        |  210 +-
 src/backend/bookshelfmodel/btbookshelfmodel.cpp    |  130 +-
 src/backend/bookshelfmodel/btbookshelfmodel.h      |  295 +-
 .../bookshelfmodel/btbookshelftreemodel.cpp        |  534 +-
 src/backend/bookshelfmodel/btbookshelftreemodel.h  |  308 +-
 src/backend/bookshelfmodel/categoryitem.cpp        |   24 +-
 src/backend/bookshelfmodel/categoryitem.h          |   33 +-
 src/backend/bookshelfmodel/indexingitem.cpp        |   24 +-
 src/backend/bookshelfmodel/indexingitem.h          |   25 +-
 src/backend/bookshelfmodel/item.cpp                |   48 +-
 src/backend/bookshelfmodel/item.h                  |  266 +-
 src/backend/bookshelfmodel/languageitem.cpp        |   15 +-
 src/backend/bookshelfmodel/languageitem.h          |   26 +-
 src/backend/bookshelfmodel/moduleitem.cpp          |   11 +-
 src/backend/bookshelfmodel/moduleitem.h            |   46 +-
 src/backend/btinstallbackend.cpp                   |   78 +-
 src/backend/btinstallbackend.h                     |    6 +-
 src/backend/btinstallmgr.cpp                       |   99 +
 src/backend/btinstallmgr.h                         |   73 +
 src/backend/btinstallthread.cpp                    |  143 +
 src/backend/btinstallthread.h                      |   94 +
 src/backend/btmoduletreeitem.cpp                   |    2 +-
 src/backend/btmoduletreeitem.h                     |   16 +-
 src/backend/config/btconfig.cpp                    |  363 ++
 src/backend/config/btconfig.h                      |  248 +
 src/backend/config/btconfigcore.cpp                |  202 +
 src/backend/config/btconfigcore.h                  |  342 ++
 src/backend/config/cbtconfig.cpp                   |  776 ---
 src/backend/config/cbtconfig.h                     |  204 -
 src/backend/cswordmodulesearch.cpp                 |  293 +-
 src/backend/cswordmodulesearch.h                   |   15 +-
 src/backend/drivers/cswordbiblemoduleinfo.cpp      |   33 +-
 src/backend/drivers/cswordbiblemoduleinfo.h        |    7 +-
 src/backend/drivers/cswordbookmoduleinfo.cpp       |   31 +-
 src/backend/drivers/cswordbookmoduleinfo.h         |   11 +-
 src/backend/drivers/cswordcommentarymoduleinfo.cpp |    6 +-
 src/backend/drivers/cswordcommentarymoduleinfo.h   |   14 +-
 src/backend/drivers/cswordlexiconmoduleinfo.cpp    |   16 +-
 src/backend/drivers/cswordlexiconmoduleinfo.h      |    8 +-
 src/backend/drivers/cswordmoduleinfo.cpp           |  924 ++--
 src/backend/drivers/cswordmoduleinfo.h             |  812 +--
 src/backend/filters/btosismorphsegmentation.cpp    |   95 +
 src/backend/filters/btosismorphsegmentation.h      |   47 +
 src/backend/filters/gbftohtml.cpp                  |    6 +-
 src/backend/filters/gbftohtml.h                    |    4 +-
 src/backend/filters/osismorphsegmentation.cpp      |   83 -
 src/backend/filters/osismorphsegmentation.h        |   37 -
 src/backend/filters/osistohtml.cpp                 |   39 +-
 src/backend/filters/osistohtml.h                   |    4 +-
 src/backend/filters/plaintohtml.cpp                |    2 +-
 src/backend/filters/plaintohtml.h                  |    4 +-
 src/backend/filters/teitohtml.cpp                  |    9 +-
 src/backend/filters/teitohtml.h                    |    4 +-
 src/backend/filters/thmltohtml.cpp                 |   17 +-
 src/backend/filters/thmltohtml.h                   |    4 +-
 src/backend/filters/thmltoplain.cpp                |    2 +-
 src/backend/filters/thmltoplain.h                  |    4 +-
 src/backend/keys/cswordkey.cpp                     |  207 +-
 src/backend/keys/cswordkey.h                       |  227 +-
 src/backend/keys/cswordldkey.cpp                   |    6 +-
 src/backend/keys/cswordldkey.h                     |    4 +-
 src/backend/keys/cswordtreekey.cpp                 |    6 +-
 src/backend/keys/cswordtreekey.h                   |    4 +-
 src/backend/keys/cswordversekey.cpp                |   38 +-
 src/backend/keys/cswordversekey.h                  |    4 +-
 src/backend/managers/btstringmgr.cpp               |   55 +-
 src/backend/managers/btstringmgr.h                 |   22 +-
 src/backend/managers/cdisplaytemplatemgr.cpp       |   54 +-
 src/backend/managers/cdisplaytemplatemgr.h         |    4 +-
 src/backend/managers/clanguagemgr.cpp              |   35 +-
 src/backend/managers/clanguagemgr.h                |  117 +-
 src/backend/managers/cswordbackend.cpp             |  461 +-
 src/backend/managers/cswordbackend.h               |  429 +-
 src/backend/managers/referencemanager.cpp          |   37 +-
 src/backend/managers/referencemanager.h            |    4 +-
 src/backend/rendering/cbookdisplay.cpp             |    2 +-
 src/backend/rendering/cbookdisplay.h               |    4 +-
 src/backend/rendering/cchapterdisplay.cpp          |    6 +-
 src/backend/rendering/cchapterdisplay.h            |    4 +-
 src/backend/rendering/cdisplayrendering.cpp        |    5 +-
 src/backend/rendering/cdisplayrendering.h          |    9 +-
 src/backend/rendering/centrydisplay.cpp            |    7 +-
 src/backend/rendering/centrydisplay.h              |    8 +-
 src/backend/rendering/chtmlexportrendering.cpp     |   30 +-
 src/backend/rendering/chtmlexportrendering.h       |   12 +-
 .../rendering/cplaintextexportrendering.cpp        |    2 +-
 src/backend/rendering/cplaintextexportrendering.h  |    9 +-
 src/backend/rendering/ctextrendering.cpp           |   25 +-
 src/backend/rendering/ctextrendering.h             |    6 +-
 src/bibletime.cpp                                  |   77 +-
 src/bibletime.h                                    |   98 +-
 src/bibletime_dbus.cpp                             |    5 +-
 src/bibletime_dbus_adaptor.cpp                     |    8 +-
 src/bibletime_dbus_adaptor.h                       |    4 +-
 src/bibletime_init.cpp                             |  303 +-
 src/bibletime_slots.cpp                            |  610 +--
 src/bibletimeapp.cpp                               |   39 +-
 src/bibletimeapp.h                                 |   19 +-
 src/btglobal.h                                     |   12 +-
 src/display-templates/Basic.tmpl                   |   25 +-
 src/display-templates/Blue.css                     |  222 +-
 src/display-templates/Christmastide.css            |   92 +-
 src/display-templates/Crazy.css                    |  108 +-
 src/display-templates/Green.css                    |  220 +-
 src/display-templates/HighContrast.css             |  242 +-
 src/display-templates/Simple.css                   |   96 +-
 src/frontend/bookmarks/btbookmarkfolder.cpp        |   14 +-
 src/frontend/bookmarks/btbookmarkfolder.h          |    4 +-
 src/frontend/bookmarks/btbookmarkitem.cpp          |   16 +-
 src/frontend/bookmarks/btbookmarkitem.h            |    4 +-
 src/frontend/bookmarks/btbookmarkitembase.h        |    4 +-
 src/frontend/bookmarks/btbookmarkloader.cpp        |    2 +-
 src/frontend/bookmarks/btbookmarkloader.h          |    4 +-
 src/frontend/bookmarks/bteditbookmarkdialog.cpp    |   13 +-
 src/frontend/bookmarks/bteditbookmarkdialog.h      |    4 +-
 src/frontend/bookmarks/cbookmarkindex.cpp          |   17 +-
 src/frontend/bookmarks/cbookmarkindex.h            |    4 +-
 src/frontend/bookshelfmanager/btconfigdialog.cpp   |    2 +-
 src/frontend/bookshelfmanager/btconfigdialog.h     |    4 +-
 src/frontend/bookshelfmanager/btinstallmgr.cpp     |   76 -
 src/frontend/bookshelfmanager/btinstallmgr.h       |   62 -
 .../bookshelfmanager/btmodulemanagerdialog.cpp     |   16 +-
 .../bookshelfmanager/btmodulemanagerdialog.h       |    4 +-
 .../cswordsetupinstallsourcesdialog.cpp            |   56 +-
 .../cswordsetupinstallsourcesdialog.h              |    7 +-
 .../bookshelfmanager/indexpage/btindexpage.cpp     |   19 +-
 .../bookshelfmanager/indexpage/btindexpage.h       |    4 +-
 .../installpage/btinstallmodulechooserdialog.cpp   |    2 +-
 .../installpage/btinstallmodulechooserdialog.h     |    2 +-
 .../btinstallmodulechooserdialogmodel.cpp          |   17 +-
 .../btinstallmodulechooserdialogmodel.h            |    3 +-
 .../bookshelfmanager/installpage/btinstallpage.cpp |   69 +-
 .../bookshelfmanager/installpage/btinstallpage.h   |    4 +-
 .../installpage/btinstallpagemodel.cpp             |    6 +-
 .../installpage/btinstallpagemodel.h               |    3 +-
 .../installpage/btinstallpageworkswidget.cpp       |   42 +-
 .../installpage/btinstallpageworkswidget.h         |    8 +-
 .../installpage/btinstallpathdialog.cpp            |   18 +-
 .../installpage/btinstallpathdialog.h              |    4 +-
 .../installpage/btinstallprogressdialog.cpp        |  250 +-
 .../installpage/btinstallprogressdialog.h          |   88 +-
 .../installpage/btinstallthread.cpp                |  185 -
 .../bookshelfmanager/installpage/btinstallthread.h |   99 -
 .../installpage/btrefreshprogressdialog.cpp        |    4 +-
 .../installpage/btrefreshprogressdialog.h          |    6 +-
 .../bookshelfmanager/removepage/btremovepage.cpp   |   23 +-
 .../bookshelfmanager/removepage/btremovepage.h     |    2 +-
 .../removepage/btremovepagetreemodel.cpp           |    2 +-
 .../removepage/btremovepagetreemodel.h             |    2 +-
 src/frontend/btaboutdialog.cpp                     |   16 +-
 src/frontend/btaboutdialog.h                       |    5 +-
 src/frontend/btaboutmoduledialog.cpp               |    6 +-
 src/frontend/btaboutmoduledialog.h                 |    4 +-
 src/frontend/btbookshelfdockwidget.cpp             |   22 +-
 src/frontend/btbookshelfdockwidget.h               |    2 +-
 src/frontend/btbookshelfgroupingmenu.cpp           |    7 +-
 src/frontend/btbookshelfgroupingmenu.h             |    2 +-
 src/frontend/btbookshelfview.cpp                   |   13 +-
 src/frontend/btbookshelfview.h                     |    3 +-
 src/frontend/btbookshelfwidget.cpp                 |   11 +-
 src/frontend/btbookshelfwidget.h                   |    3 +-
 src/frontend/btcentralwidget.cpp                   |   51 +
 src/frontend/btcentralwidget.h                     |   33 +
 src/frontend/btmenuview.cpp                        |    2 +-
 src/frontend/btmenuview.h                          |    2 +-
 src/frontend/btmodulechooserdialog.cpp             |   10 +-
 src/frontend/btmodulechooserdialog.h               |    4 +-
 src/frontend/btmoduleindexdialog.cpp               |    2 +-
 src/frontend/btmoduleindexdialog.h                 |    4 +-
 src/frontend/btopenworkaction.cpp                  |   11 +-
 src/frontend/btopenworkaction.h                    |    3 +-
 src/frontend/cdragdrop.h                           |    4 +-
 src/frontend/cexportmanager.cpp                    |   39 +-
 src/frontend/cexportmanager.h                      |   10 +-
 src/frontend/cinfodisplay.cpp                      |  304 +-
 src/frontend/cinfodisplay.h                        |  102 +-
 src/frontend/cmdiarea.cpp                          |   86 +-
 src/frontend/cmdiarea.h                            |   23 +-
 src/frontend/cprinter.cpp                          |    3 +-
 src/frontend/cprinter.h                            |    4 +-
 src/frontend/crossrefrendering.cpp                 |    2 +-
 src/frontend/crossrefrendering.h                   |    9 +-
 src/frontend/display/btcolorwidget.cpp             |    2 +-
 src/frontend/display/btcolorwidget.h               |    4 +-
 src/frontend/display/btfindwidget.cpp              |  118 +
 src/frontend/display/btfindwidget.h                |   56 +
 src/frontend/display/btfontsizewidget.cpp          |    2 +-
 src/frontend/display/btfontsizewidget.h            |    4 +-
 src/frontend/display/bthtml.js                     |  156 +-
 src/frontend/display/bthtmlfindtext.cpp            |   95 -
 src/frontend/display/bthtmlfindtext.h              |   36 -
 src/frontend/display/bthtmlfindtext.ui             |  145 -
 src/frontend/display/bthtmljsobject.cpp            |   42 +-
 src/frontend/display/bthtmljsobject.h              |    4 +-
 src/frontend/display/bthtmlreaddisplay.cpp         |   10 +-
 src/frontend/display/bthtmlreaddisplay.h           |   17 +-
 src/frontend/display/cdisplay.cpp                  |   16 +-
 src/frontend/display/cdisplay.h                    |   17 +-
 src/frontend/display/chtmlwritedisplay.cpp         |  183 +-
 src/frontend/display/chtmlwritedisplay.h           |   52 +-
 src/frontend/display/cplainwritedisplay.cpp        |    9 +-
 src/frontend/display/cplainwritedisplay.h          |   31 +-
 src/frontend/display/creaddisplay.cpp              |    2 +-
 src/frontend/display/creaddisplay.h                |    6 +-
 src/frontend/display/cwritedisplay.cpp             |   21 -
 src/frontend/display/cwritedisplay.h               |   47 -
 src/frontend/displaywindow/btactioncollection.cpp  |   67 +-
 src/frontend/displaywindow/btactioncollection.h    |   35 +-
 .../displaywindow/btdisplaysettingsbutton.cpp      |    9 +-
 .../displaywindow/btdisplaysettingsbutton.h        |    4 +-
 src/frontend/displaywindow/btmodulechooserbar.cpp  |    2 +-
 src/frontend/displaywindow/btmodulechooserbar.h    |    4 +-
 .../displaywindow/btmodulechooserbutton.cpp        |   14 +-
 src/frontend/displaywindow/btmodulechooserbutton.h |    4 +-
 src/frontend/displaywindow/bttextwindowheader.cpp  |    2 +-
 src/frontend/displaywindow/bttextwindowheader.h    |    4 +-
 .../displaywindow/bttextwindowheaderwidget.cpp     |   23 +-
 .../displaywindow/bttextwindowheaderwidget.h       |    4 +-
 .../displaywindow/bttoolbarpopupaction.cpp         |    2 +-
 src/frontend/displaywindow/bttoolbarpopupaction.h  |    4 +-
 src/frontend/displaywindow/btwindowmodulechooser.h |    4 +-
 src/frontend/displaywindow/cbiblereadwindow.cpp    |   91 +-
 src/frontend/displaywindow/cbiblereadwindow.h      |   44 +-
 src/frontend/displaywindow/cbookreadwindow.cpp     |   36 +-
 src/frontend/displaywindow/cbookreadwindow.h       |   46 +-
 .../displaywindow/ccommentaryreadwindow.cpp        |   38 +-
 src/frontend/displaywindow/ccommentaryreadwindow.h |   18 +-
 src/frontend/displaywindow/cdisplaywindow.cpp      |  122 +-
 src/frontend/displaywindow/cdisplaywindow.h        |   19 +-
 .../displaywindow/cdisplaywindowfactory.cpp        |   11 +-
 src/frontend/displaywindow/cdisplaywindowfactory.h |   14 +-
 src/frontend/displaywindow/chtmlwritewindow.cpp    |   70 +-
 src/frontend/displaywindow/chtmlwritewindow.h      |   36 +-
 src/frontend/displaywindow/clexiconreadwindow.cpp  |   13 +-
 src/frontend/displaywindow/clexiconreadwindow.h    |    6 +-
 src/frontend/displaywindow/cplainwritewindow.cpp   |  159 +-
 src/frontend/displaywindow/cplainwritewindow.h     |   56 +-
 src/frontend/displaywindow/creadwindow.cpp         |   56 +-
 src/frontend/displaywindow/creadwindow.h           |   28 +-
 src/frontend/displaywindow/cwritewindow.cpp        |  158 -
 src/frontend/displaywindow/cwritewindow.h          |   92 -
 src/frontend/keychooser/bthistory.cpp              |    5 +-
 src/frontend/keychooser/bthistory.h                |    6 +-
 src/frontend/keychooser/cbookkeychooser.cpp        |  163 +-
 src/frontend/keychooser/cbookkeychooser.h          |  142 +-
 src/frontend/keychooser/cbooktreechooser.cpp       |   20 +-
 src/frontend/keychooser/cbooktreechooser.h         |    6 +-
 src/frontend/keychooser/ckeychooser.cpp            |   56 +-
 src/frontend/keychooser/ckeychooser.h              |  161 +-
 src/frontend/keychooser/ckeychooserwidget.cpp      |  214 +-
 src/frontend/keychooser/ckeychooserwidget.h        |  274 +-
 src/frontend/keychooser/clexiconkeychooser.cpp     |   25 +-
 src/frontend/keychooser/clexiconkeychooser.h       |    6 +-
 src/frontend/keychooser/cscrollbutton.cpp          |    6 +-
 src/frontend/keychooser/cscrollbutton.h            |    5 +-
 src/frontend/keychooser/cscrollerwidgetset.cpp     |   79 +-
 src/frontend/keychooser/cscrollerwidgetset.h       |   96 +-
 .../versekeychooser/btbiblekeywidget.cpp           |   18 +-
 .../keychooser/versekeychooser/btbiblekeywidget.h  |    4 +-
 .../versekeychooser/btdropdownchooserbutton.cpp    |    2 +-
 .../versekeychooser/btdropdownchooserbutton.h      |    4 +-
 .../keychooser/versekeychooser/btversekeymenu.cpp  |    8 +-
 .../keychooser/versekeychooser/btversekeymenu.h    |    4 +-
 .../versekeychooser/cbiblekeychooser.cpp           |   15 +-
 .../keychooser/versekeychooser/cbiblekeychooser.h  |   10 +-
 .../dialogutil.cpp => frontend/messagedialog.cpp}  |   20 +-
 .../dialogutil.h => frontend/messagedialog.h}      |   26 +-
 src/frontend/profile/cprofile.cpp                  |  380 --
 src/frontend/profile/cprofile.h                    |  113 -
 src/frontend/profile/cprofilemgr.cpp               |  118 -
 src/frontend/profile/cprofilemgr.h                 |   67 -
 src/frontend/profile/cprofilewindow.cpp            |   30 -
 src/frontend/profile/cprofilewindow.h              |   45 -
 .../analysis/csearchanalysisdialog.cpp             |    6 +-
 .../searchdialog/analysis/csearchanalysisdialog.h  |    4 +-
 .../searchdialog/analysis/csearchanalysisitem.cpp  |   57 +-
 .../searchdialog/analysis/csearchanalysisitem.h    |   18 +-
 .../analysis/csearchanalysislegenditem.cpp         |    2 +-
 .../analysis/csearchanalysislegenditem.h           |    4 +-
 .../searchdialog/analysis/csearchanalysisscene.cpp |  136 +-
 .../searchdialog/analysis/csearchanalysisscene.h   |    4 +-
 .../searchdialog/analysis/csearchanalysisview.cpp  |    2 +-
 .../searchdialog/analysis/csearchanalysisview.h    |    4 +-
 .../searchdialog/btsearchmodulechooserdialog.cpp   |    6 +-
 .../searchdialog/btsearchmodulechooserdialog.h     |    3 +-
 src/frontend/searchdialog/btsearchoptionsarea.cpp  |   58 +-
 src/frontend/searchdialog/btsearchoptionsarea.h    |    6 +-
 src/frontend/searchdialog/btsearchresultarea.cpp   |  332 +-
 src/frontend/searchdialog/btsearchresultarea.h     |   14 +-
 .../searchdialog/btsearchsyntaxhelpdialog.cpp      |   11 +-
 .../searchdialog/btsearchsyntaxhelpdialog.h        |    5 +-
 src/frontend/searchdialog/chistorycombobox.cpp     |    2 +-
 src/frontend/searchdialog/chistorycombobox.h       |    4 +-
 src/frontend/searchdialog/cmoduleresultview.cpp    |   81 +-
 src/frontend/searchdialog/cmoduleresultview.h      |    4 +-
 src/frontend/searchdialog/crangechooserdialog.cpp  |   26 +-
 src/frontend/searchdialog/crangechooserdialog.h    |    4 +-
 src/frontend/searchdialog/csearchdialog.cpp        |   32 +-
 src/frontend/searchdialog/csearchdialog.h          |    4 +-
 src/frontend/searchdialog/csearchresultview.cpp    |   22 +-
 src/frontend/searchdialog/csearchresultview.h      |    4 +-
 .../settingsdialogs/btfontchooserwidget.cpp        |    2 +-
 src/frontend/settingsdialogs/btfontchooserwidget.h |    4 +-
 src/frontend/settingsdialogs/btfontsettings.cpp    |   30 +-
 src/frontend/settingsdialogs/btfontsettings.h      |    8 +-
 .../settingsdialogs/btlanguagesettings.cpp         |   19 +-
 src/frontend/settingsdialogs/btlanguagesettings.h  |    4 +-
 src/frontend/settingsdialogs/btshortcutsdialog.cpp |    6 +-
 src/frontend/settingsdialogs/btshortcutsdialog.h   |    4 +-
 src/frontend/settingsdialogs/btshortcutseditor.cpp |    2 +-
 src/frontend/settingsdialogs/btshortcutseditor.h   |    4 +-
 .../settingsdialogs/btstandardworkstab.cpp         |  203 +
 src/frontend/settingsdialogs/btstandardworkstab.h  |   55 +
 src/frontend/settingsdialogs/bttextfilterstab.cpp  |   87 +
 src/frontend/settingsdialogs/bttextfilterstab.h    |   54 +
 .../settingsdialogs/cacceleratorsettings.cpp       |   58 +-
 .../settingsdialogs/cacceleratorsettings.h         |    4 +-
 .../settingsdialogs/cconfigurationdialog.cpp       |   19 +-
 .../settingsdialogs/cconfigurationdialog.h         |    4 +-
 src/frontend/settingsdialogs/cdisplaysettings.cpp  |   19 +-
 src/frontend/settingsdialogs/cdisplaysettings.h    |    4 +-
 src/frontend/settingsdialogs/clistwidget.cpp       |    6 +-
 src/frontend/settingsdialogs/clistwidget.h         |    6 +-
 src/frontend/settingsdialogs/cswordsettings.cpp    |  306 +-
 src/frontend/settingsdialogs/cswordsettings.h      |   97 +-
 src/frontend/tips/bttipdialog.cpp                  |   32 +-
 src/frontend/tips/bttipdialog.h                    |    4 +-
 src/main.cpp                                       |   65 +-
 src/mobile/bibletime.cpp                           |  101 +
 src/mobile/bibletime.h                             |   31 +
 src/mobile/bibletimeapp.cpp                        |   95 +
 src/mobile/bibletimeapp.h                          |   55 +
 src/mobile/bookshelfmanager/installmanager.cpp     |  371 ++
 src/mobile/bookshelfmanager/installmanager.h       |   82 +
 src/mobile/bookshelfmanager/installprogress.cpp    |  199 +
 src/mobile/bookshelfmanager/installprogress.h      |   61 +
 src/mobile/bookshelfmanager/installsources.cpp     |   75 +
 src/mobile/bookshelfmanager/installsources.h       |   52 +
 .../bookshelfmanager/installsourcesmanager.cpp     |   85 +
 .../bookshelfmanager/installsourcesmanager.h       |   45 +
 src/mobile/btmmain.cpp                             |  106 +
 src/mobile/btmmain.h                               |   23 +
 src/mobile/keychooser/bookkeychooser.cpp           |  272 +
 src/mobile/keychooser/bookkeychooser.h             |   81 +
 src/mobile/keychooser/versechooser.cpp             |  160 +
 src/mobile/keychooser/versechooser.h               |   86 +
 src/mobile/models/bibletextmodelbuilder.cpp        |  184 +
 src/mobile/models/bibletextmodelbuilder.h          |   46 +
 src/mobile/models/booktextmodelbuilder.cpp         |  101 +
 src/mobile/models/booktextmodelbuilder.h           |   40 +
 src/mobile/models/roleitemmodel.cpp                |   54 +
 src/mobile/models/roleitemmodel.h                  |   24 +
 src/mobile/qml/ContextMenu.qml                     |   62 +
 src/mobile/qml/FontSizeSlider.qml                  |  139 +
 src/mobile/qml/GridChooser.qml                     |  117 +
 src/mobile/qml/GridChooserButton.qml               |   52 +
 src/mobile/qml/ImageButton.qml                     |   24 +
 src/mobile/qml/InstallManagerChooser.qml           |  153 +
 src/mobile/qml/ListTextView.qml                    |  108 +
 src/mobile/qml/ListWorksView.qml                   |  123 +
 src/mobile/qml/MainToolbar.qml                     |   27 +
 src/mobile/qml/MenuButton.qml                      |   30 +
 src/mobile/qml/MenuView.qml                        |   28 +
 src/mobile/qml/Menus.qml                           |   61 +
 src/mobile/qml/ModuleChooser.qml                   |  109 +
 src/mobile/qml/Progress.qml                        |   63 +
 src/mobile/qml/Settings.qml                        |   93 +
 src/mobile/qml/TreeChooser.qml                     |  167 +
 src/mobile/qml/Window.qml                          |  178 +
 src/mobile/qml/WindowManager.qml                   |  291 ++
 src/mobile/qml/checkmark.svg                       |   42 +
 src/mobile/qml/leftarrow.svg                       |   83 +
 src/mobile/qml/main.qml                            |  270 +
 src/mobile/qml/rightarrow.svg                      |   82 +
 src/mobile/qml/tab.png                             |  Bin 0 -> 507 bytes
 src/mobile/ui/btstyle.cpp                          |  334 ++
 src/mobile/ui/btstyle.h                            |  132 +
 src/mobile/ui/btwindowinterface.cpp                |  257 +
 src/mobile/ui/btwindowinterface.h                  |   73 +
 src/mobile/ui/gridchooser.cpp                      |   63 +
 src/mobile/ui/gridchooser.h                        |   43 +
 src/mobile/ui/modulechooser.cpp                    |   44 +
 src/mobile/ui/modulechooser.h                      |   35 +
 src/mobile/ui/moduleinterface.cpp                  |  187 +
 src/mobile/ui/moduleinterface.h                    |   48 +
 src/mobile/ui/qtquick2applicationviewer.cpp        |   63 +
 src/mobile/ui/qtquick2applicationviewer.h          |   32 +
 src/mobile/ui/treechoosermodel.cpp                 |   22 +
 src/mobile/ui/treechoosermodel.h                   |   20 +
 src/mobile/ui/viewmanager.cpp                      |   52 +
 src/mobile/ui/viewmanager.h                        |   34 +
 src/mobile/util/findqmlobject.cpp                  |   34 +
 src/mobile/util/findqmlobject.h                    |   28 +
 src/mobile/util/messagedialog.cpp                  |   36 +
 src/mobile/util/messagedialog.h                    |   36 +
 src/util/btmodules.cpp                             |    2 +-
 src/util/btmodules.h                               |    4 +-
 src/util/btsignal.h                                |   40 +-
 src/util/cresmgr.cpp                               |    8 +-
 src/util/cresmgr.h                                 |   10 +-
 src/util/directory.cpp                             |  287 +-
 src/util/directory.h                               |   11 +-
 src/util/exceptions.h                              |    4 +-
 src/util/geticon.cpp                               |   54 +
 src/util/geticon.h                                 |   30 +
 src/util/htmlescape.h                              |   33 +
 src/util/macros.h                                  |    4 +-
 src/util/tool.cpp                                  |   98 +-
 src/util/tool.h                                    |   82 +-
 583 files changed, 35793 insertions(+), 58306 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 at ristioja.ee>
-    * Released 2.9.2.
+2014-07-05 Jaak Ristioja <jaak at ristioja.ee>
+    * Released 2.10.1.
+
+2013-12-24 Jaak Ristioja <jaak at ristioja.ee>
+    * Released 2.10.0.
+
+2013-12-23 Jaak Ristioja <jaak at 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 at ristioja.ee>
+    * Fixed some settings not being properly loaded on startup.
+
+2013-12-18 Jaak Ristioja <jaak at ristioja.ee>
+    * Released 2.10 RC 1.
+
+2013-12-11 Jaak Ristioja <jaak at ristioja.ee>
+    * Released 2.10 beta 1.
+
+2013-12-10 Jaak Ristioja <jaak at 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 at gmail.com>
+    * Fix bug 27, Control Panel version was wrong on Windows
 
 2013-05-19 Gary Holmlund <gary.holmlund at gmail.com>
     * Fix multi-arch path issue in FindCLucene.cmake
 
-2013-05-18 Gary Holmlund <gary.holmlund at gmail.com>
-    * Changes needed for Qt5
+2013-03-02 Jaak Ristioja <jaak at 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 at gmail.com>
+    * Added support for HTTP, HTTPS, SFTP transports in BibleTime
 
-2013-05-18 Gary Holmlund <gary.holmlund at gmail.com>
-    * Fix problem with text not displaying when using QtWebKit 2.3
+2013-01-15 Jaak Ristioja <jaak at ristioja.ee>
+    * Fixed widget ending up disabled after removing install source.
+
+2012-12-16 Gary Holmlund <gary.holmlund at gmail.com>
+    * More Qt5 updates needed by Qt5 rc2 version
+
+2012-11-03 Gary Holmlund <gary.holmlund at gmail.com>
+    * Add Find widget at bottom of MDI area
 
 2012-09-10 Gary Holmlund <gary.holmlund at gmail.com>
     * Fix bug 14 - Headers displayed as plain text in some modules
 
+2012-08-25 Gary Holmlund <gary.holmlund at gmail.com>
+    * Add support for Qt5
+
+2012-07-18 Gary Holmlund <gary.holmlund at gmail.com>
+    * Mag Window uses current module if no default cross reference is set
+
 2012-03-30 Gary Holmlund <gary.holmlund at gmail.com>
     * Fix crash when closing window with tab.
 
+2012-03-10 Jaak Ristioja <jaak at 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 at gmail.com>
     * Fix bug 3483206 where duplicate works menus appear on ubuntu with its Global Menus
 
-2011-12-28 Jaak Ristioja <jaak at ristioja.ee>
-    * Fixed settings dialog tab contents not being translated.
-
-2011-12-22 Jaak Ristioja <jaak at ristioja.ee>
-    * Released 2.9.1.
-
-2011-12-08 Jaak Ristioja <jaak at ristioja.ee>
-    * Updated Estonian translation.
-    * Released 2.9.0.
+2012-02-12 Gary Holmlund <gary.holmlund at gmail.com>
+    * Allow comboxboxes on config dialog desk page to resize.
+      Idea from Timothy Whitehead
 
 2011-12-02 Jaak Ristioja <jaak at 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 at 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 at ristioja.ee>
-    * Released 2.9 RC 2.
+2011-11-14 Jaak Ristioja <jaak at ristioja.ee>
+    * Completely substituted the old profile system with a BtConfig-based one.
 
 2011-11-12 Gary Holmlund <gary.holmlund at 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 at ristioja.ee>
+    * Merged the the new configuration based on the work of Patrick Zimmermann.
+
 2011-11-07 Jaak Ristioja <jaak at 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 at 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
similarity index 100%
rename from cmake/FindLibraryWithDebug.cmake
rename to 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
similarity index 63%
rename from cmake/sword_version_compare.cpp
rename to 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/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>دليل إستخدام بيبل تايم</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="بيبل تايم هو برنامج مجاني &#1578 [...]
-بإطار عمل كيوت، والذي يتيح للبرنامج العمل على عدة أنظمة تشغيل تتضمن لينكس،
-ويندوز، فري بي إس دي و ماك أو إس إكس. البرنامج يستخدم مكتبة برمجة سورد ليعمل
-مجاناً مع أكثر من 200 ترجمة للكتاب المقدس، تفاسير، قواميس وكتب مقدمة من
-جمعية الكتاب المقدس كروس وير.</p></div></div></div><hr></div><div class="toc"><p><b>قائمة المحتويات</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. مقدمة</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-i [...]
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>دليل إستخدام بيبل تايم</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="بيبل تايم is a completely free Bible study program. The program's user interface is built with كي& [...]
+interface is built with <span class="application">كيوت</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">سورد</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">جمعية الكتاب المقدس كروس وير </span>.</p></div></div></div><hr></div><div class="toc"><p><b>قائمة المحتويات</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. مقدمة</a></span></ [...]
         <span class="guimenu">عرض</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">المكتب</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ř�ruč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  [...]
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Př�ruč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  [...]
 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�l [...]
+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=" [...]
         <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
Binary files a/docs/handbook/cs/pdf/handbook.pdf and b/docs/handbook/cs/pdf/handbook.pdf differ
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 [...]
-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</ [...]
+<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 2 [...]
+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><spa [...]
         <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
Binary files a/docs/handbook/de/pdf/handbook.pdf and b/docs/handbook/de/pdf/handbook.pdf differ
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
Binary files a/docs/handbook/en/html/i_back.png and b/docs/handbook/en/html/i_back.png differ
diff --git a/docs/handbook/en/html/i_bible.png b/docs/handbook/en/html/i_bible.png
index a5a1b40..ab38153 100644
Binary files a/docs/handbook/en/html/i_bible.png and b/docs/handbook/en/html/i_bible.png differ
diff --git a/docs/handbook/en/html/i_bible_add.png b/docs/handbook/en/html/i_bible_add.png
index 0f2f7db..9e4ee86 100644
Binary files a/docs/handbook/en/html/i_bible_add.png and b/docs/handbook/en/html/i_bible_add.png differ
diff --git a/docs/handbook/en/html/i_bibletime.png b/docs/handbook/en/html/i_bibletime.png
index 944cbb2..bf192b6 100644
Binary files a/docs/handbook/en/html/i_bibletime.png and b/docs/handbook/en/html/i_bibletime.png differ
diff --git a/docs/handbook/en/html/i_book.png b/docs/handbook/en/html/i_book.png
index 793cb17..1ae9920 100644
Binary files a/docs/handbook/en/html/i_book.png and b/docs/handbook/en/html/i_book.png differ
diff --git a/docs/handbook/en/html/i_book_add.png b/docs/handbook/en/html/i_book_add.png
index 77b10dc..f4374c9 100644
Binary files a/docs/handbook/en/html/i_book_add.png and b/docs/handbook/en/html/i_book_add.png differ
diff --git a/docs/handbook/en/html/i_bookmark.png b/docs/handbook/en/html/i_bookmark.png
index cd1bea8..546aca0 100644
Binary files a/docs/handbook/en/html/i_bookmark.png and b/docs/handbook/en/html/i_bookmark.png differ
diff --git a/docs/handbook/en/html/i_books.png b/docs/handbook/en/html/i_books.png
index 4a61d41..8633588 100644
Binary files a/docs/handbook/en/html/i_books.png and b/docs/handbook/en/html/i_books.png differ
diff --git a/docs/handbook/en/html/i_cascade.png b/docs/handbook/en/html/i_cascade.png
index ae3a1b1..664e68a 100644
Binary files a/docs/handbook/en/html/i_cascade.png and b/docs/handbook/en/html/i_cascade.png differ
diff --git a/docs/handbook/en/html/i_checkbox.png b/docs/handbook/en/html/i_checkbox.png
index 72ad383..034d1c9 100644
Binary files a/docs/handbook/en/html/i_checkbox.png and b/docs/handbook/en/html/i_checkbox.png differ
diff --git a/docs/handbook/en/html/i_commentary.png b/docs/handbook/en/html/i_commentary.png
index e6ca28b..673c882 100644
Binary files a/docs/handbook/en/html/i_commentary.png and b/docs/handbook/en/html/i_commentary.png differ
diff --git a/docs/handbook/en/html/i_commentary_add.png b/docs/handbook/en/html/i_commentary_add.png
index 33030ad..7ab0d56 100644
Binary files a/docs/handbook/en/html/i_commentary_add.png and b/docs/handbook/en/html/i_commentary_add.png differ
diff --git a/docs/handbook/en/html/i_configure.png b/docs/handbook/en/html/i_configure.png
index 48a1267..1d4ccf8 100644
Binary files a/docs/handbook/en/html/i_configure.png and b/docs/handbook/en/html/i_configure.png differ
diff --git a/docs/handbook/en/html/i_configuresword.png b/docs/handbook/en/html/i_configuresword.png
index 850bc63..563c107 100644
Binary files a/docs/handbook/en/html/i_configuresword.png and b/docs/handbook/en/html/i_configuresword.png differ
diff --git a/docs/handbook/en/html/i_contents2.png b/docs/handbook/en/html/i_contents2.png
index a639120..f0ab6d0 100644
Binary files a/docs/handbook/en/html/i_contents2.png and b/docs/handbook/en/html/i_contents2.png differ
diff --git a/docs/handbook/en/html/i_displayconfig.png b/docs/handbook/en/html/i_displayconfig.png
index 7486926..6e404b6 100644
Binary files a/docs/handbook/en/html/i_displayconfig.png and b/docs/handbook/en/html/i_displayconfig.png differ
diff --git a/docs/handbook/en/html/i_document_magnifier.png b/docs/handbook/en/html/i_document_magnifier.png
index 2cf2116..ef557c7 100644
Binary files a/docs/handbook/en/html/i_document_magnifier.png and b/docs/handbook/en/html/i_document_magnifier.png differ
diff --git a/docs/handbook/en/html/i_exit.png b/docs/handbook/en/html/i_exit.png
index ee8d937..42287fa 100644
Binary files a/docs/handbook/en/html/i_exit.png and b/docs/handbook/en/html/i_exit.png differ
diff --git a/docs/handbook/en/html/i_fileclose.png b/docs/handbook/en/html/i_fileclose.png
index 2ecbfb3..b581902 100644
Binary files a/docs/handbook/en/html/i_fileclose.png and b/docs/handbook/en/html/i_fileclose.png differ
diff --git a/docs/handbook/en/html/i_find.png b/docs/handbook/en/html/i_find.png
index 38df97a..55ad019 100644
Binary files a/docs/handbook/en/html/i_find.png and b/docs/handbook/en/html/i_find.png differ
diff --git a/docs/handbook/en/html/i_forward.png b/docs/handbook/en/html/i_forward.png
index dbaa939..c483281 100644
Binary files a/docs/handbook/en/html/i_forward.png and b/docs/handbook/en/html/i_forward.png differ
diff --git a/docs/handbook/en/html/i_lexicon.png b/docs/handbook/en/html/i_lexicon.png
index dfb911a..55ce153 100644
Binary files a/docs/handbook/en/html/i_lexicon.png and b/docs/handbook/en/html/i_lexicon.png differ
diff --git a/docs/handbook/en/html/i_lexicon_add.png b/docs/handbook/en/html/i_lexicon_add.png
index 3523e74..7feb268 100644
Binary files a/docs/handbook/en/html/i_lexicon_add.png and b/docs/handbook/en/html/i_lexicon_add.png differ
diff --git a/docs/handbook/en/html/i_light_bulb.png b/docs/handbook/en/html/i_light_bulb.png
index cd82d15..bf5c769 100644
Binary files a/docs/handbook/en/html/i_light_bulb.png and b/docs/handbook/en/html/i_light_bulb.png differ
diff --git a/docs/handbook/en/html/i_sync.png b/docs/handbook/en/html/i_sync.png
index 734fe4d..e032716 100644
Binary files a/docs/handbook/en/html/i_sync.png and b/docs/handbook/en/html/i_sync.png differ
diff --git a/docs/handbook/en/html/i_tile.png b/docs/handbook/en/html/i_tile.png
index b6890eb..375d367 100644
Binary files a/docs/handbook/en/html/i_tile.png and b/docs/handbook/en/html/i_tile.png differ
diff --git a/docs/handbook/en/html/i_tile_horiz.png b/docs/handbook/en/html/i_tile_horiz.png
index 4f9845f..2b65027 100644
Binary files a/docs/handbook/en/html/i_tile_horiz.png and b/docs/handbook/en/html/i_tile_horiz.png differ
diff --git a/docs/handbook/en/html/i_tile_vert.png b/docs/handbook/en/html/i_tile_vert.png
index 892d57a..3560865 100644
Binary files a/docs/handbook/en/html/i_tile_vert.png and b/docs/handbook/en/html/i_tile_vert.png differ
diff --git a/docs/handbook/en/html/i_view_index.png b/docs/handbook/en/html/i_view_index.png
index bb29508..99e5a7d 100644
Binary files a/docs/handbook/en/html/i_view_index.png and b/docs/handbook/en/html/i_view_index.png differ
diff --git a/docs/handbook/en/html/i_window_fullscreen.png b/docs/handbook/en/html/i_window_fullscreen.png
index c1aee15..284accb 100644
Binary files a/docs/handbook/en/html/i_window_fullscreen.png and b/docs/handbook/en/html/i_window_fullscreen.png differ
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 2 [...]
+<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 2 [...]
       <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 [...]
+      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-i [...]
         <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
Binary files a/docs/handbook/en/html/ss_configfonts.png and b/docs/handbook/en/html/ss_configfonts.png differ
diff --git a/docs/handbook/en/html/ss_mainterms.png b/docs/handbook/en/html/ss_mainterms.png
index d81d71b..cc4d222 100644
Binary files a/docs/handbook/en/html/ss_mainterms.png and b/docs/handbook/en/html/ss_mainterms.png differ
diff --git a/docs/handbook/en/html/ss_searchanal.png b/docs/handbook/en/html/ss_searchanal.png
index 812a392..8812a91 100644
Binary files a/docs/handbook/en/html/ss_searchanal.png and b/docs/handbook/en/html/ss_searchanal.png differ
diff --git a/docs/handbook/en/html/ss_searchopts.png b/docs/handbook/en/html/ss_searchopts.png
index df4b01e..264bf75 100644
Binary files a/docs/handbook/en/html/ss_searchopts.png and b/docs/handbook/en/html/ss_searchopts.png differ
diff --git a/docs/handbook/en/html/ss_shortcuts.png b/docs/handbook/en/html/ss_shortcuts.png
index 2b9dfa2..489b919 100644
Binary files a/docs/handbook/en/html/ss_shortcuts.png and b/docs/handbook/en/html/ss_shortcuts.png differ
diff --git a/docs/handbook/en/pdf/handbook.pdf b/docs/handbook/en/pdf/handbook.pdf
index a9a7e39..ee5a198 100644
Binary files a/docs/handbook/en/pdf/handbook.pdf and b/docs/handbook/en/pdf/handbook.pdf differ
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 [...]
-<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 [...]
+<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  [...]
+<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>< [...]
         <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
Binary files a/docs/handbook/es/pdf/handbook.pdf and b/docs/handbook/es/pdf/handbook.pdf differ
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 2 [...]
+<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 2 [...]
 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-wo [...]
+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="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
Binary files a/docs/handbook/fi/pdf/handbook.pdf and b/docs/handbook/fi/pdf/handbook.pdf differ
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 pro [...]
-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">Œ [...]
+<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 2 [...]
+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">Œuvres disponibles</a></span></d [...]
         <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
Binary files a/docs/handbook/fr/pdf/handbook.pdf and b/docs/handbook/fr/pdf/handbook.pdf differ
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ő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 p [...]
-program kezelőfel�lete a <span class="application">Qt</span> 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 <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ő dokumentu [...]
+<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  [...]
+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ő dokumentumok</a></span></dt><dt><spa [...]
         <span class="guimenu">K�pernyő</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
Binary files a/docs/handbook/hu/pdf/handbook.pdf and b/docs/handbook/hu/pdf/handbook.pdf differ
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 lavora [...]
-<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">< [...]
+<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  [...]
+<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 cl [...]
         <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
Binary files a/docs/handbook/it/pdf/handbook.pdf and b/docs/handbook/it/pdf/handbook.pdf differ
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 2 [...]
+<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 2 [...]
 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- [...]
+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><spa [...]
         <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
Binary files a/docs/handbook/nl/pdf/handbook.pdf and b/docs/handbook/nl/pdf/handbook.pdf differ
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  [...]
-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 [...]
+<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 o [...]
+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 clas [...]
         <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/nl/pdf/handbook.pdf b/docs/handbook/pt_BR/pdf/handbook.pdf
similarity index 81%
copy from docs/handbook/nl/pdf/handbook.pdf
copy to docs/handbook/pt_BR/pdf/handbook.pdf
index 2dcfb44..24d3f23 100644
Binary files a/docs/handbook/nl/pdf/handbook.pdf and b/docs/handbook/pt_BR/pdf/handbook.pdf differ
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 at 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>كيفية دراسة الكتاب المقدس</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="تلخيص The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the بيب&# [...]
-(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="ملاحظة قانونية"><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>كيفية دراسة الكتاب المقدس</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="تلخيص The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the بيب&# [...]
+(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="ملاحظة قانونية"><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>نصوص الكتاب المقدس العربية مقتبسة من ترجمة سميث فان دايك مالم يذكر غير ذلك.</p></div></div [...]
 Bible.</p><p>It is the hope of the <span class="application">بيبل تايم</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 at 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>Ръководство за изучаване на Библията</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Резюме The Biblestudy HowTo is [...]
-(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="Авторски права"><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>Ръководство за изучаване на Библията</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Резюме The Biblestudy HowTo is [...]
+(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="Авторски права"><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="Резюме"><p class="title"><b>Резюме</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 at 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ůvodn� anglick� zně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 n [...]
-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ž�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="ri [...]
-(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="Pr�vn� dolož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ž�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="ri [...]
+(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="Pr�vn� dolož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ůvodn� anglick� zněn�:"><p class="title"><b>Původn� anglick� zně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 at 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 pa [...]
-(bt-devel at 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 pa [...]
+(bt-devel at 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 at 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 s [...]
-(bt-devel at 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 s [...]
+(bt-devel at 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 at 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 part [...]
+<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 part [...]
       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 at 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 [...]
-(bt-devel at 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 [...]
+(bt-devel at 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 at 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 [...]
-(bt-devel at 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 [...]
+(bt-devel at 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 at 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 p [...]
-(bt-devel at 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 p [...]
+(bt-devel at 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 at 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  [...]
-(bt-devel at 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  [...]
+(bt-devel at 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 at 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 advoca [...]
-(bt-devel at 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 advoca [...]
+(bt-devel at 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 at 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>바이블스터디 하우투</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="개요 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 gu [...]
-(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="법적 공지"><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>바이블스터디 하우투</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="개요 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 gu [...]
+(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="법적 공지"><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 class="title"><b>개요</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 at 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 parti [...]
-(bt-devel at 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 parti [...]
+(bt-devel at 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 at 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 denom [...]
-(bt-devel at 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 denom [...]
+(bt-devel at 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 at 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>Как изучать Библию</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Резюме 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  [...]
-(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="Юридическое уведомление"><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>Как изучать Библию</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Резюме 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  [...]
+(bt-devel at crosswire.org)</p></div><div><div class="legalnotice" title="Юридическое уведомление"><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 class="title"><b>Резюме</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 at 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 at yahoo.com>\n"
 "Language-Team: LANGUAGE <LL at 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 at 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 at atlas.cz>\n"
 "Language-Team: Czech <kde-i18n-doc at 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 at 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 at 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 at 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 at fedoraproject.org>\n"
 "Language-Team: Spanish <kde-i18n-doc at 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 at 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 at iki.fi>\n"
 "Language-Team: Finnish <fi at 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 at 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 at FreeBSD.org>\n"
 "Language-Team: BibleTime Translators <bibletime-translasions at 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 at 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 at gmail.com>\n"
 "Language-Team: Hungarian <hu at 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 at 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 at FreeBSD.org>\n"
 "Language-Team: Italian <kde-i18n-it at 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 at 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 at 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 at 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 at FreeBSD.org>\n"
 "Language-Team: Português do Brasil <kde-i18n-doc at 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 at 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at 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 at 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 at yahoo.com>\n"
 "Language-Team: LANGUAGE <LL at 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 at 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 at crosswire.org)</holder> </copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>فريق بيبل تايم ; (info at bibletime."
+"<copyright> <year>1999-2014</year> <holder>فريق بيبل تايم ; (info at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at gulix.cl>\n"
 "Language-Team: Spanish <kde-i18n-doc at 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: "Arrepentíos, y bautícese cada uno "
-"de vosotros en el nombre de Jesucristo para perdón de los pecados; [...]"
-"" </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>"Porque no me envió Cristo a bautizar, "
-"sino a predicar el evangelio" </emphasis>?"
+"de vosotros en el nombre de Jesucristo para perdón de los pecados; "
+"[...]" </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>"Porque no me envió Cristo "
+"a bautizar, sino a predicar el evangelio" </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 at 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 at 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 at iki.fi>\n"
 "Language-Team: Finnish <fi at 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 at 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 at 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 at gmail.com>\n"
 "Language-Team: Français <fr at 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 at 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 at crosswire.org)</holder> </copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>L'équipe BibleTime; "
+"<copyright> <year>1999-2014</year> <holder>L'équipe BibleTime; "
 "(info at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at ku.edu.np>\n"
 "Language-Team:  <ko at 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 at 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 at 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 at zonnet.nl>\n"
 "Language-Team: Nederlands <nl at 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 at 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 at 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 at FreeBSD.org>\n"
 "Language-Team: Português do Brasil <kde-i18n-doc at 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 at 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 at 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 at mail.ru>\n"
 "Language-Team: russain <ru at 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 at 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 at 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at 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 at 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>&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>&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>&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>&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&itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&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>&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>&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>&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>&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.<br/>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>&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>&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>&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>&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 &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 &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-&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>&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 &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 &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&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>&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>&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 "%1" 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 &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 &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 &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-&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&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>&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 &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>&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'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 &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'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>&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>&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&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 "Whats this widget" 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'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>&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>&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>&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&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'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'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.</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>&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>&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>&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>&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'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>&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>&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 &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>&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,265 +1695,406 @@ shortcut</source>
     </message>
 </context>
 <context>
-    <name>BtTextWindowHeaderWidget</name>
+    <name>BtStandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
-        <source>Add/remove/replace</source>
+        <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/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
-        <source>Remove</source>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
-        <source>Replace</source>
+        <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/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
-        <source>Add</source>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</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>
+        <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/tips/bttipdialog.cpp" line="81"/>
-        <source>Show tips at startup</source>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
-        <source>Next Tip</source>
+        <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/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>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</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>
+        <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/tips/bttipdialog.cpp" line="132"/>
-        <source>To learn more about the BibleTime project please go to our web site.</source>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong's lexicon:</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>
+        <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/tips/bttipdialog.cpp" line="138"/>
-        <source>Select the icon again to stop the synchronization.</source>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong's lexicon:</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>
+        <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/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>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</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>
+        <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/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>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</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>
+        <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/tips/bttipdialog.cpp" line="161"/>
-        <source>You can search for Strong's numbers in a work. Start with a work that has Strong's numbers and hover over a word. Right click the word and use the Strong's Search menu. A search dialog will appear that allows you to see the use of the same Strong's number in other locations of the work.</source>
+        <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/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>
+        <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/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>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
+        <source>Show verse numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
-        <source>You can view Strong's number information in the MAG window by hovering over a word in a Bible work that has Strong's numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
+        <source>Show section headings</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>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</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>
+        <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/cacceleratorsettings.cpp" line="135"/>
-        <source>Main Window</source>
+        <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/cacceleratorsettings.cpp" line="136"/>
-        <source>All text windows</source>
+        <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/cacceleratorsettings.cpp" line="137"/>
-        <source>Bible windows</source>
+        <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/cacceleratorsettings.cpp" line="138"/>
-        <source>Commentary windows</source>
+        <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/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
-        <source>Lexicon windows</source>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
+        <source>Add/remove/replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
-        <source>Book windows</source>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
-        <source>
-   "%1" in the "%2" group</source>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <source>Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
-        <source>Shortcuts</source>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CBibleReadWindow</name>
+    <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
-        <source>Next book</source>
+        <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/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <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="94"/>
+        <source>Next Tip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="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="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="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="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="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="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="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="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="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="163"/>
+        <source>You can search for Strong's numbers in a work. Start with a work that has Strong's numbers and hover over a word. Right click the word and use the Strong's Search menu. A search dialog will appear that allows you to see the use of the same Strong's number in other locations of the work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="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="174"/>
+        <source>You can view Strong's number information in the MAG window by hovering over a word in a Bible work that has Strong'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="128"/>
+        <source>Choose action group:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="131"/>
+        <source>All text windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="133"/>
+        <source>Commentary windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="135"/>
+        <source>Book windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
+        <source>
+   "%1" in the "%2" group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
+        <source>Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CBibleReadWindow</name>
+    <message>
+        <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="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'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'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'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'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'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 <a href="http://www.bibletime.info/">BibleTime</a></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'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><div class="moduleinfo"><h3>%1</h3><p>%2</p><p>Version: %3</p></div></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><small>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.</small></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't work yet :)) ------ </comment>
         <extracomment>The string "Names of languages" doesn'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 [...]
         <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'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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</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>
+        <source>Remote FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</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="423"/>
-        <source>Letters/Epistles</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="424"/>
-        <source>Paul's Epistles</source>
+        <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 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'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'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'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'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'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 "%1" 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>&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&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&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> (<a href='syntax_help'>full syntax</a>)</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).<br />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 'Full syntax' option. 'All words' and 'Some words' options have more limited syntax; <a href='#wildcards'>wildcards</a> and <a href='#fields'>text fields</a> 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. <strong>AND</strong> (all words), <strong>OR</strong> (some words) and <strong>NOT</strong> (not the following word) can be added between the words. If none is added explicitly OR is used automatically. '<strong>+</strong>word' means the word must be in the results, '<strong>-</strong>word' means it must not be in the results.</source>
         <comment>Do not translate "AND", "OR" or "NOT".</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 "AND".</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 'Jesus' and 'God'</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 "OR".</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 'Jesus' or 'God' 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 "NOT".</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 'Jesus' but with no 'God'</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 <strong>parenthesis</strong>. Strict word order can be defined with <strong>quotes</strong>.</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 "AND" or "OR".</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 'a' AND 'b', and verses with 'c'</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>"says lord"</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>"says the lord"</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 'says the LORD'</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>'<strong>*</strong>' matches any sequence of 0 or more characters, while '<strong>?</strong>' 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 'a'</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>'Assyria', 'aroma', 'abba' 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>'at' and 'an'</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>'abba', 'area', 'Asia' 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'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 "heading:".</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 'Jesus'</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 "footnote:" or "AND".</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 'Jesus' and 'said'</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 "strong:".</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'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:"N-NSF"</source>
         <comment>Do not translate "morph:".</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 'N-NSF'</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 <a href='%1'>lucene syntax web page</a> (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 "Yes" to index the modules and start the search, or "No" 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>&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>&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>
-    <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'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'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>
+    <name>btm::InstallProgress</name>
     <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>
-    <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>
+    <name>btm::InstallSources</name>
     <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 &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>&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>&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>&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>&File</source>
         <translation>&ملف</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&View</source>
         <translation>&عرض</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&Search</source>
         <translation>&بحث</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&Window</source>
         <translation>&نافذة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&ttings</source>
         <translation>إع&دادات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&Help</source>
         <translation>م&ساعدة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&Show toolbar</source>
         <translation>&إظهار شريط الأدوات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&Fullscreen mode</source>
         <translation>&نمط ملء الشاشة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&Quit</source>
         <translation>&خروج</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.<br/>This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>فتح كيفية دراسة الكتاب المقدس ببيبل تايم.<br/>هذا الملف عبارة عن مقدمة في كيفية دراسة الكتاب المقدس بطريقة فعالة.</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>&Save session</source>
-        <translation type="unfinished">&حفظ جلسة</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&Load session</source>
-        <translation>&تحميل جلسة</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&Delete session</source>
         <translation>ح&ذف جلسة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&Arrangement mode</source>
         <translation>&نمط الترتيب</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&Manual mode</source>
         <translation>ال&نمط اليدوي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &vertically</source>
         <translation>ترتيب &عمودي تلقائي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &horizontally</source>
         <translation>ترتيب &أفقي تلقائي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&cascade</source>
         <translation>ت&دريج تلقائي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&Cascade</source>
         <translation>ت&دريج</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &vertically</source>
         <translation>ترتيب &عمودي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &horizontally</source>
         <translation>ترتيب &أفقي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&ose all windows</source>
         <translation>إغلاق &كل النوافذ</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>&Handbook</source>
         <translation>&دليل الإستخدام</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&Bible Study Howto</source>
         <translation>&كيفية دراسة الكتاب المقدس</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 "%1" 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 &open works...</source>
         <translation>ابحث في الكتب ال&مفتوحة...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &Bible...</source>
         <translation>ابحث في ترجمة ال&كتاب المقدس الإفتراضية...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &new session...</source>
         <translation>حفظ كجلسة &جديدة...</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-&tile</source>
         <translation>ت&رتيب تلقائي</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&bbed</source>
         <translation>وضع الأ&لسنة</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>&Tile</source>
         <translation>&ترتيب</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 &window</source>
         <translation>إ&غلاق النافذة</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>&Configure BibleTime...</source>
         <translation>&ضبط بيبل تايم...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime'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 &Manager...</source>
         <translation>مدير &رف الكتب...</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's handbook</source>
         <translation>فتح دليل إستخدام بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&Tip of the day...</source>
         <translation>&تلميح اليوم...</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&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&pen windows</source>
         <translation>&فتح نوافذ</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show "Whats this widget" dialog</source>
         <translation>إظهار مربع حوار "ما هذه القطعة"</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'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>&About BibleTime</source>
         <translation>&عن بيبل تايم</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>&BibleTime</source>
         <translation>&بيبل تايم</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>&Contributors</source>
         <translation>ال&مساهمون</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>ال&رخصة</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&lter:</source>
         <translation>&فلترة:</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'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'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.</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>&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>
@@ -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.<br/><b>WARNING:</b> If you live in a persecuted country and don't want to risk detection don't use remote sources.</source>
-        <translation type="obsolete">ثبت وحدث الكتب. اضف مصادر خارجية أو من على الجهاز، قم بتحديثهم، اختر الكتب التي تريد تثبيتها/تحديثها واضغط على تثبيت.<br/><b>تحذير:</b> إذا كنت تعيش في بلد إضطهاد وترغب في تجنب مخاطرة الإكتشاف لا تستخدم المصادر الخارجية.</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>&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>&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>&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'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>&Open work</source>
         <translation>&فتح كتاب</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>&Grouping order</source>
         <translation>&ترتيب المجموعات</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>&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 &works to uninstall:</source>
         <translation>اختر ال&كتب التي تريد إزالتها:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&Remove...</source>
         <translation>إ&زالة...</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>&Add...</source>
-        <translation type="obsolete">إضافة...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">تحديث...</translation>
-    </message>
+    <name>BtStandardWorksTab</name>
     <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>
-    </message>
-    <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's lexicon:</source>
+        <translation type="unfinished">معجم سترونج العبري:</translation>
     </message>
     <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn'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'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>&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's numbers in a work. Start with a work that has Strong's numbers and hover over a word. Right click the word and use the Strong's Search menu. A search dialog will appear that allows you to see the use of the same Strong'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's numbers in a work. Start with a work that has Strong's numbers and hover over a word. Right click the word and use the Strong's Search menu. A search dialog will appear that allows you to see the use of the sameStrong'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's number information in the MAG window by hovering over a word in a Bible work that has Strong'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 "Edit Bookmark...". After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="obsolete">لتغيير عنوان أو وصف علامة، انقر بالزر الأيمن على العلامة واختر "تحرير علامة...". بعد الإنتهاء من التحرير ستتمكن من مشاهدة الوصف عن طريق المرور بالمؤشر على العلامة.</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>
    "%1" in the "%2" group</source>
         <translation>..."%1" في مجموعة "%2"</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'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'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'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'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'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="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>كتاب</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 <a href="http://www.bibletime.info/">BibleTime</a></source>
         <translation>تم الإنشاء بواسطة <a href="http://www.bibletime.info/">بيبل تايم</a></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'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>Conn