From 294b5ec5834affa57641475946b8d2aeca53c577 Mon Sep 17 00:00:00 2001 From: "Roberto C. Sanchez" Date: Tue, 21 Oct 2014 22:48:31 -0400 Subject: [PATCH] Imported Upstream version 2.4 --- CMakeLists.txt | 741 +- ChangeLog | 86 +- cmake/BTCpack.cmake | 134 + cmake/BTDeveloper.cmake | 16 + cmake/BTDocumentation.cmake | 75 + ...urce_list.cmake => BTSourceFileList.cmake} | 51 +- cmake/BTWinIcon.rc | 1 + cmake/config.h.cmake | 15 - cmake/platforms/linux/bibletime.desktop.cmake | 11 +- cmake/platforms/windows/README.txt | 2 + cmake/platforms/windows/filemgr.cpp | 570 + docs/handbook/cs/docbook/hdbk-config.docbook | 55 +- docs/handbook/cs/docbook/hdbk-intro.docbook | 39 +- .../cs/docbook/hdbk-operation.docbook | 101 +- .../cs/docbook/hdbk-reference.docbook | 38 +- docs/handbook/cs/docbook/hdbk-start.docbook | 21 +- docs/handbook/cs/docbook/index.docbook | 9 +- docs/handbook/cs/html/hdbk-config.html | 45 +- docs/handbook/cs/html/hdbk-intro.html | 27 +- .../cs/html/hdbk-op-bookshelfmanager.html | 14 +- docs/handbook/cs/html/hdbk-op-output.html | 2 +- docs/handbook/cs/html/hdbk-op-parts.html | 24 +- docs/handbook/cs/html/hdbk-op-search.html | 39 +- docs/handbook/cs/html/hdbk-op.html | 2 +- ...eys.html => hdbk-reference-shortcuts.html} | 12 +- .../cs/html/hdbk-reference-toolbar.html | 10 - .../cs/html/hdbk-reference-works.html | 4 +- docs/handbook/cs/html/hdbk-reference.html | 18 +- docs/handbook/cs/html/hdbk-startsequence.html | 2 +- docs/handbook/cs/html/hdbk-term.html | 14 +- docs/handbook/cs/html/index.html | 12 +- docs/handbook/de/docbook/hdbk-config.docbook | 60 +- docs/handbook/de/docbook/hdbk-intro.docbook | 18 +- .../de/docbook/hdbk-operation.docbook | 65 +- .../de/docbook/hdbk-reference.docbook | 17 +- docs/handbook/de/docbook/hdbk-start.docbook | 23 +- docs/handbook/de/docbook/index.docbook | 10 +- docs/handbook/de/html/hdbk-config.html | 50 +- docs/handbook/de/html/hdbk-intro.html | 13 +- .../de/html/hdbk-op-bookshelfmanager.html | 8 +- docs/handbook/de/html/hdbk-op-output.html | 2 +- docs/handbook/de/html/hdbk-op-parts.html | 8 +- docs/handbook/de/html/hdbk-op-search.html | 33 +- docs/handbook/de/html/hdbk-op.html | 2 +- ...eys.html => hdbk-reference-shortcuts.html} | 6 +- .../de/html/hdbk-reference-toolbar.html | 10 - .../de/html/hdbk-reference-works.html | 4 +- docs/handbook/de/html/hdbk-reference.html | 12 +- docs/handbook/de/html/hdbk-startsequence.html | 2 +- docs/handbook/de/html/hdbk-term.html | 16 +- docs/handbook/de/html/index.html | 13 +- docs/handbook/en/docbook/hdbk-config.docbook | 65 +- docs/handbook/en/docbook/hdbk-intro.docbook | 29 +- .../en/docbook/hdbk-operation.docbook | 72 +- .../en/docbook/hdbk-reference.docbook | 22 +- docs/handbook/en/docbook/hdbk-start.docbook | 25 +- docs/handbook/en/docbook/index.docbook | 11 +- docs/handbook/en/html/hdbk-config.html | 57 +- docs/handbook/en/html/hdbk-intro.html | 30 +- .../en/html/hdbk-op-bookshelfmanager.html | 8 +- docs/handbook/en/html/hdbk-op-output.html | 2 +- docs/handbook/en/html/hdbk-op-parts.html | 11 +- docs/handbook/en/html/hdbk-op-search.html | 40 +- docs/handbook/en/html/hdbk-op.html | 2 +- ...eys.html => hdbk-reference-shortcuts.html} | 10 +- .../en/html/hdbk-reference-toolbar.html | 14 - .../en/html/hdbk-reference-works.html | 4 +- docs/handbook/en/html/hdbk-reference.html | 10 +- docs/handbook/en/html/hdbk-startsequence.html | 2 +- docs/handbook/en/html/hdbk-term.html | 18 +- docs/handbook/en/html/index.html | 16 +- docs/handbook/en/html/ss_mainterms.png | Bin 56706 -> 56572 bytes docs/handbook/en/html/ss_shortcuts.png | Bin 0 -> 23503 bytes docs/handbook/fi/docbook/hdbk-config.docbook | 56 +- docs/handbook/fi/docbook/hdbk-intro.docbook | 24 +- .../fi/docbook/hdbk-operation.docbook | 61 +- .../fi/docbook/hdbk-reference.docbook | 25 +- docs/handbook/fi/docbook/hdbk-start.docbook | 22 +- docs/handbook/fi/docbook/index.docbook | 9 +- docs/handbook/fi/html/hdbk-config.html | 47 +- docs/handbook/fi/html/hdbk-intro.html | 15 +- .../fi/html/hdbk-op-bookshelfmanager.html | 10 +- docs/handbook/fi/html/hdbk-op-output.html | 2 +- docs/handbook/fi/html/hdbk-op-parts.html | 10 +- docs/handbook/fi/html/hdbk-op-search.html | 27 +- docs/handbook/fi/html/hdbk-op.html | 2 +- ...eys.html => hdbk-reference-shortcuts.html} | 11 +- .../fi/html/hdbk-reference-toolbar.html | 10 - .../fi/html/hdbk-reference-works.html | 4 +- docs/handbook/fi/html/hdbk-reference.html | 10 +- docs/handbook/fi/html/hdbk-startsequence.html | 2 +- docs/handbook/fi/html/hdbk-term.html | 15 +- docs/handbook/fi/html/index.html | 12 +- docs/handbook/fr/docbook/hdbk-config.docbook | 57 +- docs/handbook/fr/docbook/hdbk-intro.docbook | 18 +- .../fr/docbook/hdbk-operation.docbook | 60 +- .../fr/docbook/hdbk-reference.docbook | 33 +- docs/handbook/fr/docbook/hdbk-start.docbook | 22 +- docs/handbook/fr/docbook/index.docbook | 9 +- docs/handbook/fr/html/hdbk-config.html | 48 +- docs/handbook/fr/html/hdbk-intro.html | 14 +- .../fr/html/hdbk-op-bookshelfmanager.html | 10 +- docs/handbook/fr/html/hdbk-op-output.html | 2 +- docs/handbook/fr/html/hdbk-op-parts.html | 10 +- docs/handbook/fr/html/hdbk-op-search.html | 25 +- docs/handbook/fr/html/hdbk-op.html | 2 +- ...eys.html => hdbk-reference-shortcuts.html} | 11 +- .../fr/html/hdbk-reference-toolbar.html | 10 - .../fr/html/hdbk-reference-works.html | 4 +- docs/handbook/fr/html/hdbk-reference.html | 15 +- docs/handbook/fr/html/hdbk-startsequence.html | 2 +- docs/handbook/fr/html/hdbk-term.html | 15 +- docs/handbook/fr/html/index.html | 12 +- docs/handbook/hu/docbook/hdbk-config.docbook | 60 +- docs/handbook/hu/docbook/hdbk-intro.docbook | 21 +- .../hu/docbook/hdbk-operation.docbook | 275 +- .../hu/docbook/hdbk-reference.docbook | 83 +- docs/handbook/hu/docbook/hdbk-start.docbook | 21 +- docs/handbook/hu/docbook/index.docbook | 9 +- docs/handbook/hu/html/hdbk-config.html | 51 +- docs/handbook/hu/html/hdbk-intro.html | 18 +- .../hu/html/hdbk-op-bookshelfmanager.html | 11 +- docs/handbook/hu/html/hdbk-op-output.html | 16 +- docs/handbook/hu/html/hdbk-op-parts.html | 96 +- docs/handbook/hu/html/hdbk-op-search.html | 92 +- docs/handbook/hu/html/hdbk-op.html | 17 +- ...eys.html => hdbk-reference-shortcuts.html} | 18 +- .../hu/html/hdbk-reference-toolbar.html | 15 - .../hu/html/hdbk-reference-works.html | 31 +- docs/handbook/hu/html/hdbk-reference.html | 36 +- docs/handbook/hu/html/hdbk-startsequence.html | 2 +- docs/handbook/hu/html/hdbk-term.html | 12 +- docs/handbook/hu/html/index.html | 14 +- docs/handbook/nl/docbook/hdbk-config.docbook | 58 +- docs/handbook/nl/docbook/hdbk-intro.docbook | 18 +- .../nl/docbook/hdbk-operation.docbook | 64 +- .../nl/docbook/hdbk-reference.docbook | 33 +- docs/handbook/nl/docbook/hdbk-start.docbook | 22 +- docs/handbook/nl/docbook/index.docbook | 9 +- docs/handbook/nl/html/hdbk-config.html | 48 +- docs/handbook/nl/html/hdbk-intro.html | 13 +- .../nl/html/hdbk-op-bookshelfmanager.html | 10 +- docs/handbook/nl/html/hdbk-op-output.html | 2 +- docs/handbook/nl/html/hdbk-op-parts.html | 11 +- docs/handbook/nl/html/hdbk-op-search.html | 28 +- docs/handbook/nl/html/hdbk-op.html | 2 +- ...eys.html => hdbk-reference-shortcuts.html} | 11 +- .../nl/html/hdbk-reference-toolbar.html | 10 - .../nl/html/hdbk-reference-works.html | 4 +- docs/handbook/nl/html/hdbk-reference.html | 15 +- docs/handbook/nl/html/hdbk-startsequence.html | 2 +- docs/handbook/nl/html/hdbk-term.html | 15 +- docs/handbook/nl/html/index.html | 12 +- .../pt-br/docbook/hdbk-config.docbook | 57 +- .../handbook/pt-br/docbook/hdbk-intro.docbook | 40 +- .../pt-br/docbook/hdbk-operation.docbook | 102 +- .../pt-br/docbook/hdbk-reference.docbook | 38 +- .../handbook/pt-br/docbook/hdbk-start.docbook | 22 +- docs/handbook/pt-br/docbook/index.docbook | 9 +- docs/handbook/pt-br/html/hdbk-config.html | 48 +- docs/handbook/pt-br/html/hdbk-intro.html | 27 +- .../pt-br/html/hdbk-op-bookshelfmanager.html | 14 +- docs/handbook/pt-br/html/hdbk-op-output.html | 2 +- docs/handbook/pt-br/html/hdbk-op-parts.html | 25 +- docs/handbook/pt-br/html/hdbk-op-search.html | 37 +- docs/handbook/pt-br/html/hdbk-op.html | 2 +- ...eys.html => hdbk-reference-shortcuts.html} | 11 +- .../pt-br/html/hdbk-reference-works.html | 4 +- docs/handbook/pt-br/html/hdbk-reference.html | 17 +- .../pt-br/html/hdbk-startsequence.html | 2 +- docs/handbook/pt-br/html/hdbk-term.html | 15 +- docs/handbook/pt-br/html/index.html | 12 +- docs/howto/bg/html/h2-basics-approaches.html | 2 +- docs/howto/bg/html/h2-basics-expository.html | 2 +- .../bg/html/h2-basics-interpretation.html | 2 +- docs/howto/bg/html/h2-basics-types.html | 2 +- docs/howto/bg/html/h2-basics-worksheet.html | 2 +- docs/howto/bg/html/h2-basics.html | 2 +- .../howto/bg/html/h2-importance-breathed.html | 2 +- .../bg/html/h2-importance-exhortations.html | 2 +- .../bg/html/h2-importance-liberates.html | 2 +- docs/howto/bg/html/h2-importance-once.html | 2 +- .../bg/html/h2-importance-supplement.html | 2 +- docs/howto/bg/html/h2-importance-wars.html | 2 +- docs/howto/bg/html/h2-importance-works.html | 2 +- docs/howto/bg/html/h2-importance.html | 2 +- docs/howto/bg/html/h2-rules-context.html | 2 +- docs/howto/bg/html/h2-rules-hcontest.html | 2 +- docs/howto/bg/html/h2-rules-normal.html | 2 +- docs/howto/bg/html/h2-rules-parables.html | 2 +- docs/howto/bg/html/h2-rules.html | 2 +- docs/howto/bg/html/index.html | 2 +- docs/howto/cs/html/h2-basics-approaches.html | 2 +- docs/howto/cs/html/h2-basics-expository.html | 2 +- .../cs/html/h2-basics-interpretation.html | 2 +- docs/howto/cs/html/h2-basics-types.html | 2 +- docs/howto/cs/html/h2-basics-worksheet.html | 2 +- docs/howto/cs/html/h2-basics.html | 2 +- .../howto/cs/html/h2-importance-breathed.html | 2 +- .../cs/html/h2-importance-exhortations.html | 2 +- .../cs/html/h2-importance-liberates.html | 2 +- docs/howto/cs/html/h2-importance-once.html | 2 +- .../cs/html/h2-importance-supplement.html | 2 +- docs/howto/cs/html/h2-importance-wars.html | 2 +- docs/howto/cs/html/h2-importance-works.html | 2 +- docs/howto/cs/html/h2-importance.html | 2 +- docs/howto/cs/html/h2-rules-context.html | 2 +- docs/howto/cs/html/h2-rules-hcontest.html | 2 +- docs/howto/cs/html/h2-rules-normal.html | 2 +- docs/howto/cs/html/h2-rules-parables.html | 2 +- docs/howto/cs/html/h2-rules.html | 2 +- docs/howto/cs/html/index.html | 2 +- docs/howto/da/html/h2-basics-approaches.html | 2 +- docs/howto/da/html/h2-basics-expository.html | 2 +- .../da/html/h2-basics-interpretation.html | 2 +- docs/howto/da/html/h2-basics-types.html | 2 +- docs/howto/da/html/h2-basics-worksheet.html | 2 +- docs/howto/da/html/h2-basics.html | 2 +- .../howto/da/html/h2-importance-breathed.html | 2 +- .../da/html/h2-importance-exhortations.html | 2 +- .../da/html/h2-importance-liberates.html | 2 +- docs/howto/da/html/h2-importance-once.html | 2 +- .../da/html/h2-importance-supplement.html | 2 +- docs/howto/da/html/h2-importance-wars.html | 2 +- docs/howto/da/html/h2-importance-works.html | 2 +- docs/howto/da/html/h2-importance.html | 2 +- docs/howto/da/html/h2-rules-context.html | 2 +- docs/howto/da/html/h2-rules-hcontest.html | 2 +- docs/howto/da/html/h2-rules-normal.html | 2 +- docs/howto/da/html/h2-rules-parables.html | 2 +- docs/howto/da/html/h2-rules.html | 2 +- docs/howto/da/html/index.html | 2 +- docs/howto/de/docbook/howto-basics.docbook | 86 +- .../howto/de/docbook/howto-importance.docbook | 175 +- .../de/docbook/howto-interpretation.docbook | 315 +- docs/howto/de/docbook/index.docbook | 30 +- docs/howto/de/html/h2-basics-approaches.html | 19 +- docs/howto/de/html/h2-basics-expository.html | 16 +- .../de/html/h2-basics-interpretation.html | 2 +- docs/howto/de/html/h2-basics-types.html | 2 +- docs/howto/de/html/h2-basics-worksheet.html | 25 +- docs/howto/de/html/h2-basics.html | 26 +- .../howto/de/html/h2-importance-breathed.html | 51 +- .../de/html/h2-importance-exhortations.html | 12 +- .../de/html/h2-importance-liberates.html | 15 +- docs/howto/de/html/h2-importance-once.html | 43 +- .../de/html/h2-importance-supplement.html | 7 +- docs/howto/de/html/h2-importance-wars.html | 4 +- docs/howto/de/html/h2-importance-works.html | 7 +- docs/howto/de/html/h2-importance.html | 42 +- docs/howto/de/html/h2-rules-context.html | 43 +- docs/howto/de/html/h2-rules-hcontest.html | 46 +- docs/howto/de/html/h2-rules-normal.html | 45 +- docs/howto/de/html/h2-rules-parables.html | 30 +- docs/howto/de/html/h2-rules.html | 129 +- docs/howto/de/html/index.html | 30 +- docs/howto/en/html/h2-basics-approaches.html | 2 +- docs/howto/en/html/h2-basics-expository.html | 2 +- .../en/html/h2-basics-interpretation.html | 2 +- docs/howto/en/html/h2-basics-types.html | 2 +- docs/howto/en/html/h2-basics-worksheet.html | 2 +- docs/howto/en/html/h2-basics.html | 2 +- .../howto/en/html/h2-importance-breathed.html | 2 +- .../en/html/h2-importance-exhortations.html | 2 +- .../en/html/h2-importance-liberates.html | 2 +- docs/howto/en/html/h2-importance-once.html | 2 +- .../en/html/h2-importance-supplement.html | 2 +- docs/howto/en/html/h2-importance-wars.html | 2 +- docs/howto/en/html/h2-importance-works.html | 2 +- docs/howto/en/html/h2-importance.html | 2 +- docs/howto/en/html/h2-rules-context.html | 2 +- docs/howto/en/html/h2-rules-hcontest.html | 2 +- docs/howto/en/html/h2-rules-normal.html | 2 +- docs/howto/en/html/h2-rules-parables.html | 2 +- docs/howto/en/html/h2-rules.html | 2 +- docs/howto/en/html/index.html | 2 +- docs/howto/es/html/h2-basics-approaches.html | 2 +- docs/howto/es/html/h2-basics-expository.html | 2 +- .../es/html/h2-basics-interpretation.html | 2 +- docs/howto/es/html/h2-basics-types.html | 2 +- docs/howto/es/html/h2-basics-worksheet.html | 2 +- docs/howto/es/html/h2-basics.html | 2 +- .../howto/es/html/h2-importance-breathed.html | 2 +- .../es/html/h2-importance-exhortations.html | 2 +- .../es/html/h2-importance-liberates.html | 2 +- docs/howto/es/html/h2-importance-once.html | 2 +- .../es/html/h2-importance-supplement.html | 2 +- docs/howto/es/html/h2-importance-wars.html | 2 +- docs/howto/es/html/h2-importance-works.html | 2 +- docs/howto/es/html/h2-importance.html | 2 +- docs/howto/es/html/h2-rules-context.html | 2 +- docs/howto/es/html/h2-rules-hcontest.html | 2 +- docs/howto/es/html/h2-rules-normal.html | 2 +- docs/howto/es/html/h2-rules-parables.html | 2 +- docs/howto/es/html/h2-rules.html | 2 +- docs/howto/es/html/index.html | 2 +- docs/howto/fi/html/h2-basics-approaches.html | 2 +- docs/howto/fi/html/h2-basics-expository.html | 2 +- .../fi/html/h2-basics-interpretation.html | 2 +- docs/howto/fi/html/h2-basics-types.html | 2 +- docs/howto/fi/html/h2-basics-worksheet.html | 2 +- docs/howto/fi/html/h2-basics.html | 2 +- .../howto/fi/html/h2-importance-breathed.html | 2 +- .../fi/html/h2-importance-exhortations.html | 2 +- .../fi/html/h2-importance-liberates.html | 2 +- docs/howto/fi/html/h2-importance-once.html | 2 +- .../fi/html/h2-importance-supplement.html | 2 +- docs/howto/fi/html/h2-importance-wars.html | 2 +- docs/howto/fi/html/h2-importance-works.html | 2 +- docs/howto/fi/html/h2-importance.html | 2 +- docs/howto/fi/html/h2-rules-context.html | 2 +- docs/howto/fi/html/h2-rules-hcontest.html | 2 +- docs/howto/fi/html/h2-rules-normal.html | 2 +- docs/howto/fi/html/h2-rules-parables.html | 2 +- docs/howto/fi/html/h2-rules.html | 2 +- docs/howto/fi/html/index.html | 2 +- docs/howto/fr/html/h2-basics-approaches.html | 2 +- docs/howto/fr/html/h2-basics-expository.html | 2 +- .../fr/html/h2-basics-interpretation.html | 2 +- docs/howto/fr/html/h2-basics-types.html | 2 +- docs/howto/fr/html/h2-basics-worksheet.html | 2 +- docs/howto/fr/html/h2-basics.html | 2 +- .../howto/fr/html/h2-importance-breathed.html | 2 +- .../fr/html/h2-importance-exhortations.html | 2 +- .../fr/html/h2-importance-liberates.html | 2 +- docs/howto/fr/html/h2-importance-once.html | 2 +- .../fr/html/h2-importance-supplement.html | 2 +- docs/howto/fr/html/h2-importance-wars.html | 2 +- docs/howto/fr/html/h2-importance-works.html | 2 +- docs/howto/fr/html/h2-importance.html | 2 +- docs/howto/fr/html/h2-rules-context.html | 2 +- docs/howto/fr/html/h2-rules-hcontest.html | 2 +- docs/howto/fr/html/h2-rules-normal.html | 2 +- docs/howto/fr/html/h2-rules-parables.html | 2 +- docs/howto/fr/html/h2-rules.html | 2 +- docs/howto/fr/html/index.html | 2 +- docs/howto/hu/html/h2-basics-approaches.html | 2 +- docs/howto/hu/html/h2-basics-expository.html | 2 +- .../hu/html/h2-basics-interpretation.html | 2 +- docs/howto/hu/html/h2-basics-types.html | 2 +- docs/howto/hu/html/h2-basics-worksheet.html | 2 +- docs/howto/hu/html/h2-basics.html | 2 +- .../howto/hu/html/h2-importance-breathed.html | 2 +- .../hu/html/h2-importance-exhortations.html | 2 +- .../hu/html/h2-importance-liberates.html | 2 +- docs/howto/hu/html/h2-importance-once.html | 2 +- .../hu/html/h2-importance-supplement.html | 2 +- docs/howto/hu/html/h2-importance-wars.html | 2 +- docs/howto/hu/html/h2-importance-works.html | 2 +- docs/howto/hu/html/h2-importance.html | 2 +- docs/howto/hu/html/h2-rules-context.html | 2 +- docs/howto/hu/html/h2-rules-hcontest.html | 2 +- docs/howto/hu/html/h2-rules-normal.html | 2 +- docs/howto/hu/html/h2-rules-parables.html | 2 +- docs/howto/hu/html/h2-rules.html | 2 +- docs/howto/hu/html/index.html | 2 +- docs/howto/it/html/h2-basics-approaches.html | 2 +- docs/howto/it/html/h2-basics-expository.html | 2 +- .../it/html/h2-basics-interpretation.html | 2 +- docs/howto/it/html/h2-basics-types.html | 2 +- docs/howto/it/html/h2-basics-worksheet.html | 2 +- docs/howto/it/html/h2-basics.html | 2 +- .../howto/it/html/h2-importance-breathed.html | 2 +- .../it/html/h2-importance-exhortations.html | 2 +- .../it/html/h2-importance-liberates.html | 2 +- docs/howto/it/html/h2-importance-once.html | 2 +- .../it/html/h2-importance-supplement.html | 2 +- docs/howto/it/html/h2-importance-wars.html | 2 +- docs/howto/it/html/h2-importance-works.html | 2 +- docs/howto/it/html/h2-importance.html | 2 +- docs/howto/it/html/h2-rules-context.html | 2 +- docs/howto/it/html/h2-rules-hcontest.html | 2 +- docs/howto/it/html/h2-rules-normal.html | 2 +- docs/howto/it/html/h2-rules-parables.html | 2 +- docs/howto/it/html/h2-rules.html | 2 +- docs/howto/it/html/index.html | 2 +- docs/howto/ko/html/h2-basics-approaches.html | 2 +- docs/howto/ko/html/h2-basics-expository.html | 2 +- .../ko/html/h2-basics-interpretation.html | 2 +- docs/howto/ko/html/h2-basics-types.html | 2 +- docs/howto/ko/html/h2-basics-worksheet.html | 2 +- docs/howto/ko/html/h2-basics.html | 2 +- .../howto/ko/html/h2-importance-breathed.html | 2 +- .../ko/html/h2-importance-exhortations.html | 2 +- .../ko/html/h2-importance-liberates.html | 2 +- docs/howto/ko/html/h2-importance-once.html | 2 +- .../ko/html/h2-importance-supplement.html | 2 +- docs/howto/ko/html/h2-importance-wars.html | 2 +- docs/howto/ko/html/h2-importance-works.html | 2 +- docs/howto/ko/html/h2-importance.html | 2 +- docs/howto/ko/html/h2-rules-context.html | 2 +- docs/howto/ko/html/h2-rules-hcontest.html | 2 +- docs/howto/ko/html/h2-rules-normal.html | 2 +- docs/howto/ko/html/h2-rules-parables.html | 2 +- docs/howto/ko/html/h2-rules.html | 2 +- docs/howto/ko/html/index.html | 2 +- docs/howto/nl/html/h2-basics-approaches.html | 2 +- docs/howto/nl/html/h2-basics-expository.html | 2 +- .../nl/html/h2-basics-interpretation.html | 2 +- docs/howto/nl/html/h2-basics-types.html | 2 +- docs/howto/nl/html/h2-basics-worksheet.html | 2 +- docs/howto/nl/html/h2-basics.html | 2 +- .../howto/nl/html/h2-importance-breathed.html | 2 +- .../nl/html/h2-importance-exhortations.html | 2 +- .../nl/html/h2-importance-liberates.html | 2 +- docs/howto/nl/html/h2-importance-once.html | 2 +- .../nl/html/h2-importance-supplement.html | 2 +- docs/howto/nl/html/h2-importance-wars.html | 2 +- docs/howto/nl/html/h2-importance-works.html | 2 +- docs/howto/nl/html/h2-importance.html | 2 +- docs/howto/nl/html/h2-rules-context.html | 2 +- docs/howto/nl/html/h2-rules-hcontest.html | 2 +- docs/howto/nl/html/h2-rules-normal.html | 2 +- docs/howto/nl/html/h2-rules-parables.html | 2 +- docs/howto/nl/html/h2-rules.html | 2 +- docs/howto/nl/html/index.html | 2 +- .../pt-br/html/h2-basics-approaches.html | 2 +- .../pt-br/html/h2-basics-expository.html | 2 +- .../pt-br/html/h2-basics-interpretation.html | 2 +- docs/howto/pt-br/html/h2-basics-types.html | 2 +- .../howto/pt-br/html/h2-basics-worksheet.html | 2 +- docs/howto/pt-br/html/h2-basics.html | 2 +- .../pt-br/html/h2-importance-breathed.html | 2 +- .../html/h2-importance-exhortations.html | 2 +- .../pt-br/html/h2-importance-liberates.html | 2 +- docs/howto/pt-br/html/h2-importance-once.html | 2 +- .../pt-br/html/h2-importance-supplement.html | 2 +- docs/howto/pt-br/html/h2-importance-wars.html | 2 +- .../howto/pt-br/html/h2-importance-works.html | 2 +- docs/howto/pt-br/html/h2-importance.html | 2 +- docs/howto/pt-br/html/h2-rules-context.html | 2 +- docs/howto/pt-br/html/h2-rules-hcontest.html | 2 +- docs/howto/pt-br/html/h2-rules-normal.html | 2 +- docs/howto/pt-br/html/h2-rules-parables.html | 2 +- docs/howto/pt-br/html/h2-rules.html | 2 +- docs/howto/pt-br/html/index.html | 2 +- docs/howto/ru/html/h2-basics-approaches.html | 2 +- docs/howto/ru/html/h2-basics-expository.html | 2 +- .../ru/html/h2-basics-interpretation.html | 2 +- docs/howto/ru/html/h2-basics-types.html | 2 +- docs/howto/ru/html/h2-basics-worksheet.html | 2 +- docs/howto/ru/html/h2-basics.html | 2 +- .../howto/ru/html/h2-importance-breathed.html | 2 +- .../ru/html/h2-importance-exhortations.html | 2 +- .../ru/html/h2-importance-liberates.html | 2 +- docs/howto/ru/html/h2-importance-once.html | 2 +- .../ru/html/h2-importance-supplement.html | 2 +- docs/howto/ru/html/h2-importance-wars.html | 2 +- docs/howto/ru/html/h2-importance-works.html | 2 +- docs/howto/ru/html/h2-importance.html | 2 +- docs/howto/ru/html/h2-rules-context.html | 2 +- docs/howto/ru/html/h2-rules-hcontest.html | 2 +- docs/howto/ru/html/h2-rules-normal.html | 2 +- docs/howto/ru/html/h2-rules-parables.html | 2 +- docs/howto/ru/html/h2-rules.html | 2 +- docs/howto/ru/html/index.html | 2 +- i18n/handbook/handbook-cs.po | 486 +- i18n/handbook/handbook-de.po | 580 +- i18n/handbook/handbook-fi.po | 530 +- i18n/handbook/handbook-fr.po | 1644 +-- i18n/handbook/handbook-hu.po | 671 +- i18n/handbook/handbook-nl.po | 1556 +- i18n/handbook/handbook-pt-br.po | 488 +- i18n/handbook/handbook.pot | 410 +- i18n/howto/howto-bg.po | 396 +- i18n/howto/howto-cs.po | 11847 +--------------- i18n/howto/howto-da.po | 4 +- i18n/howto/howto-de.po | 125 +- i18n/howto/howto-es.po | 4 +- i18n/howto/howto-fi.po | 23 +- i18n/howto/howto-fr.po | 3050 +--- i18n/howto/howto-hu.po | 6 +- i18n/howto/howto-it.po | 227 +- i18n/howto/howto-ko.po | 3402 +---- i18n/howto/howto-nl.po | 2962 +--- i18n/howto/howto-pt-br.po | 2991 +--- i18n/howto/howto-ru.po | 3606 +---- i18n/messages/bibletime_ui.ts | 2001 ++- i18n/messages/bibletime_ui_af.qm | Bin 33469 -> 32720 bytes i18n/messages/bibletime_ui_af.ts | 2006 ++- i18n/messages/bibletime_ui_bg.qm | Bin 34803 -> 34074 bytes i18n/messages/bibletime_ui_bg.ts | 2006 ++- i18n/messages/bibletime_ui_cs.qm | Bin 78978 -> 71792 bytes i18n/messages/bibletime_ui_cs.ts | 320 +- i18n/messages/bibletime_ui_da.qm | Bin 82123 -> 75803 bytes i18n/messages/bibletime_ui_da.ts | 2048 ++- i18n/messages/bibletime_ui_de.qm | Bin 110736 -> 110378 bytes i18n/messages/bibletime_ui_de.ts | 422 +- i18n/messages/bibletime_ui_en_GB.qm | Bin 59303 -> 47306 bytes i18n/messages/bibletime_ui_en_GB.ts | 2375 ++-- i18n/messages/bibletime_ui_es.qm | Bin 55890 -> 49440 bytes i18n/messages/bibletime_ui_es.ts | 2041 ++- i18n/messages/bibletime_ui_et.qm | Bin 105790 -> 102967 bytes i18n/messages/bibletime_ui_et.ts | 2100 ++- i18n/messages/bibletime_ui_fi.qm | Bin 93448 -> 100429 bytes i18n/messages/bibletime_ui_fi.ts | 2231 ++- i18n/messages/bibletime_ui_fr.qm | Bin 89414 -> 108610 bytes i18n/messages/bibletime_ui_fr.ts | 2253 ++- i18n/messages/bibletime_ui_hu.qm | Bin 109578 -> 108562 bytes i18n/messages/bibletime_ui_hu.ts | 2053 ++- i18n/messages/bibletime_ui_it.qm | Bin 36743 -> 104076 bytes i18n/messages/bibletime_ui_it.ts | 3502 +++-- i18n/messages/bibletime_ui_ko.qm | Bin 24123 -> 23420 bytes i18n/messages/bibletime_ui_ko.ts | 2005 ++- i18n/messages/bibletime_ui_nl.qm | Bin 39798 -> 38635 bytes i18n/messages/bibletime_ui_nl.ts | 2005 ++- i18n/messages/bibletime_ui_nn_NO.qm | Bin 43080 -> 41641 bytes i18n/messages/bibletime_ui_nn_NO.ts | 2011 ++- i18n/messages/bibletime_ui_no.qm | Bin 33677 -> 32904 bytes i18n/messages/bibletime_ui_no.ts | 2008 ++- i18n/messages/bibletime_ui_pl.qm | Bin 55170 -> 52596 bytes i18n/messages/bibletime_ui_pl.ts | 2017 ++- i18n/messages/bibletime_ui_pt_br.qm | Bin 80803 -> 107205 bytes i18n/messages/bibletime_ui_pt_br.ts | 2572 ++-- i18n/messages/bibletime_ui_ro.qm | Bin 51696 -> 48558 bytes i18n/messages/bibletime_ui_ro.ts | 2019 ++- i18n/messages/bibletime_ui_ru.qm | Bin 39996 -> 38837 bytes i18n/messages/bibletime_ui_ru.ts | 2005 ++- i18n/messages/bibletime_ui_sk.qm | Bin 97282 -> 99647 bytes i18n/messages/bibletime_ui_sk.ts | 2169 ++- i18n/messages/bibletime_ui_sv.qm | Bin 36223 -> 35364 bytes i18n/messages/bibletime_ui_sv.ts | 2005 ++- ...{bibletime_ui_ua.qm => bibletime_ui_uk.qm} | Bin 35925 -> 35186 bytes ...{bibletime_ui_ua.ts => bibletime_ui_uk.ts} | 2006 ++- i18n/messages/bibletime_ui_vi.qm | Bin 16852 -> 14213 bytes i18n/messages/bibletime_ui_vi.ts | 2021 ++- i18n/messages/bibletime_ui_zh_CN.qm | Bin 30266 -> 29329 bytes i18n/messages/bibletime_ui_zh_CN.ts | 2005 ++- i18n/messages/bibletime_ui_zh_TW.qm | Bin 30032 -> 29095 bytes i18n/messages/bibletime_ui_zh_TW.ts | 2005 ++- pics/icons/bibletime.ico | Bin 0 -> 11942 bytes .../bookshelfmodel/btbookshelfmodel.cpp | 74 +- src/backend/bookshelfmodel/btbookshelfmodel.h | 8 + .../bookshelfmodel/btbookshelftreemodel.cpp | 205 +- .../bookshelfmodel/btbookshelftreemodel.h | 24 +- .../btmodulecategoryfilterproxymodel.cpp | 71 + .../btmodulecategoryfilterproxymodel.h | 49 + .../btmodulehiddenfilterproxymodel.cpp | 61 + .../btmodulehiddenfilterproxymodel.h | 48 + .../btmodulenamefilterproxymodel.cpp | 6 +- .../btmodulenamefilterproxymodel.h | 1 + src/backend/bookshelfmodel/categoryitem.cpp | 8 +- src/backend/bookshelfmodel/categoryitem.h | 3 +- .../bookshelfmodel/distributionitem.cpp | 1 + src/backend/bookshelfmodel/distributionitem.h | 3 +- src/backend/bookshelfmodel/item.cpp | 9 + src/backend/bookshelfmodel/item.h | 9 +- src/backend/bookshelfmodel/languageitem.cpp | 3 +- src/backend/bookshelfmodel/languageitem.h | 7 +- src/backend/bookshelfmodel/moduleitem.cpp | 3 +- src/backend/bookshelfmodel/moduleitem.h | 9 +- src/backend/btmoduletreeitem.cpp | 27 +- src/backend/btmoduletreeitem.h | 3 +- src/backend/config/cbtconfig.cpp | 25 +- src/backend/cswordmodulesearch.cpp | 17 +- src/backend/cswordmodulesearch.h | 16 +- src/backend/drivers/cswordbiblemoduleinfo.cpp | 13 +- src/backend/drivers/cswordbiblemoduleinfo.h | 6 +- src/backend/drivers/cswordbookmoduleinfo.cpp | 9 +- src/backend/drivers/cswordbookmoduleinfo.h | 5 +- .../drivers/cswordcommentarymoduleinfo.cpp | 3 +- .../drivers/cswordcommentarymoduleinfo.h | 4 +- .../drivers/cswordlexiconmoduleinfo.cpp | 16 +- src/backend/drivers/cswordlexiconmoduleinfo.h | 5 +- src/backend/drivers/cswordmoduleinfo.cpp | 132 +- src/backend/drivers/cswordmoduleinfo.h | 49 +- src/backend/filters/bt_gbfhtml.cpp | 12 +- src/backend/filters/bt_gbfhtml.h | 8 +- src/backend/filters/bt_osishtml.cpp | 37 +- src/backend/filters/bt_osishtml.h | 4 +- src/backend/filters/bt_plainhtml.cpp | 11 +- src/backend/filters/bt_plainhtml.h | 5 +- src/backend/filters/bt_teihtml.cpp | 143 + src/backend/filters/bt_teihtml.h | 34 + src/backend/filters/bt_thmlhtml.cpp | 46 +- src/backend/filters/bt_thmlhtml.h | 3 +- src/backend/filters/bt_thmlplain.cpp | 3 +- src/backend/filters/bt_thmlplain.h | 2 + src/backend/filters/osismorphsegmentation.cpp | 8 +- src/backend/filters/osismorphsegmentation.h | 2 + src/backend/keys/cswordkey.cpp | 25 +- src/backend/keys/cswordkey.h | 2 +- src/backend/keys/cswordldkey.cpp | 8 +- src/backend/keys/cswordldkey.h | 13 +- src/backend/keys/cswordtreekey.cpp | 6 +- src/backend/keys/cswordtreekey.h | 6 +- src/backend/keys/cswordversekey.cpp | 17 +- src/backend/keys/cswordversekey.h | 9 +- src/backend/managers/btstringmgr.cpp | 3 +- src/backend/managers/btstringmgr.h | 6 +- src/backend/managers/cdisplaytemplatemgr.cpp | 31 +- src/backend/managers/cdisplaytemplatemgr.h | 9 +- src/backend/managers/clanguagemgr.cpp | 7 +- src/backend/managers/clanguagemgr.h | 7 +- src/backend/managers/creferencemanager.h | 110 - src/backend/managers/cswordbackend.cpp | 233 +- src/backend/managers/cswordbackend.h | 25 +- ...erencemanager.cpp => referencemanager.cpp} | 71 +- src/backend/managers/referencemanager.h | 106 + src/backend/rendering/cbookdisplay.cpp | 16 +- src/backend/rendering/cbookdisplay.h | 8 +- src/backend/rendering/cchapterdisplay.cpp | 9 +- src/backend/rendering/cchapterdisplay.h | 3 +- src/backend/rendering/cdisplayrendering.cpp | 24 +- src/backend/rendering/cdisplayrendering.h | 3 +- src/backend/rendering/centrydisplay.cpp | 36 +- src/backend/rendering/centrydisplay.h | 12 +- .../rendering/chtmlexportrendering.cpp | 15 +- src/backend/rendering/chtmlexportrendering.h | 5 +- .../rendering/cplaintextexportrendering.cpp | 9 +- .../rendering/cplaintextexportrendering.h | 3 +- src/backend/rendering/ctextrendering.cpp | 37 +- src/backend/rendering/ctextrendering.h | 9 +- src/bibletime.cpp | 64 +- src/bibletime.h | 61 +- src/bibletime_dbus.cpp | 16 +- src/bibletime_dbus_adaptor.cpp | 1 + src/bibletime_dbus_adaptor.h | 6 +- src/bibletime_init.cpp | 241 +- src/bibletime_slots.cpp | 113 +- src/bibletimeapp.cpp | 3 +- src/bibletimeapp.h | 3 +- src/display-templates/Blue.tmpl | 20 +- src/display-templates/Crazy.tmpl | 19 +- src/display-templates/Green.tmpl | 24 +- src/display-templates/HighContrast.tmpl | 28 +- src/display-templates/Simple.tmpl | 4 +- .../bookshelfmanager/btconfigdialog.cpp | 27 +- .../bookshelfmanager/btconfigdialog.h | 5 +- .../bookshelfmanager/btinstallmgr.cpp | 22 +- src/frontend/bookshelfmanager/btinstallmgr.h | 12 +- .../btmodulemanagerdialog.cpp | 20 +- .../bookshelfmanager/btmodulemanagerdialog.h | 4 +- .../cswordsetupinstallsourcesdialog.cpp | 157 +- .../cswordsetupinstallsourcesdialog.h | 23 +- .../indexpage/btindexpage.cpp | 37 +- .../bookshelfmanager/indexpage/btindexpage.h | 2 +- .../btinstallmodulechooserdialog.cpp | 129 +- .../btinstallmodulechooserdialog.h | 7 +- .../installpage/btinstallpage.cpp | 106 +- .../installpage/btinstallpage.h | 3 +- .../installpage/btinstallpathdialog.cpp | 166 +- .../installpage/btinstallpathdialog.h | 10 +- .../installpage/btinstallprogressdialog.cpp | 37 +- .../installpage/btinstallprogressdialog.h | 13 +- .../installpage/btinstallthread.cpp | 41 +- .../installpage/btinstallthread.h | 6 +- .../installpage/btsourcearea.cpp | 82 +- .../installpage/btsourcearea.h | 12 +- .../installpage/btsourcewidget.cpp | 171 +- .../installpage/btsourcewidget.h | 15 +- src/frontend/bookshelfmanager/instbackend.cpp | 128 +- src/frontend/bookshelfmanager/instbackend.h | 12 +- .../removepage/btremovepage.cpp | 53 +- .../removepage/btremovepage.h | 7 +- src/frontend/btaboutmoduledialog.cpp | 14 +- src/frontend/btaboutmoduledialog.h | 5 +- src/frontend/btbookshelfdockwidget.cpp | 23 +- src/frontend/btbookshelfdockwidget.h | 10 +- src/frontend/cdragdrop.cpp | 7 +- src/frontend/cdragdrop.h | 4 +- src/frontend/cdragdropmgr.cpp | 262 - src/frontend/cdragdropmgr.h | 160 - src/frontend/cexportmanager.cpp | 46 +- src/frontend/cexportmanager.h | 11 +- src/frontend/cinfodisplay.cpp | 44 +- src/frontend/cinfodisplay.h | 10 +- src/frontend/cinputdialog.cpp | 19 +- src/frontend/cinputdialog.h | 4 +- src/frontend/cmdiarea.cpp | 122 +- src/frontend/cmdiarea.h | 116 +- src/frontend/cmodulechooserdialog.cpp | 42 +- src/frontend/cmodulechooserdialog.h | 7 +- src/frontend/cmoduleindexdialog.cpp | 29 +- src/frontend/cmoduleindexdialog.h | 27 +- src/frontend/cprinter.cpp | 12 +- src/frontend/cprinter.h | 5 +- src/frontend/crossrefrendering.cpp | 31 +- src/frontend/crossrefrendering.h | 20 +- src/frontend/display/btcolorwidget.cpp | 8 +- src/frontend/display/btcolorwidget.h | 21 +- src/frontend/display/btfontsizewidget.cpp | 6 +- src/frontend/display/btfontsizewidget.h | 19 +- src/frontend/display/bthtmlfindtext.cpp | 10 +- src/frontend/display/bthtmlfindtext.h | 3 + src/frontend/display/bthtmljsobject.cpp | 31 +- src/frontend/display/bthtmljsobject.h | 3 + src/frontend/display/bthtmlreaddisplay.cpp | 47 +- src/frontend/display/bthtmlreaddisplay.h | 11 +- src/frontend/display/cdisplay.cpp | 41 +- src/frontend/display/cdisplay.h | 12 +- src/frontend/display/chtmlwritedisplay.cpp | 36 +- src/frontend/display/chtmlwritedisplay.h | 16 +- src/frontend/display/cplainwritedisplay.cpp | 29 +- src/frontend/display/cplainwritedisplay.h | 16 +- src/frontend/display/creaddisplay.cpp | 21 +- src/frontend/display/creaddisplay.h | 10 +- src/frontend/display/cwritedisplay.cpp | 14 +- src/frontend/display/cwritedisplay.h | 11 +- .../displaywindow/btactioncollection.cpp | 12 +- .../displaywindow/btactioncollection.h | 10 +- .../displaywindow/bttoolbarpopupaction.cpp | 8 +- .../displaywindow/bttoolbarpopupaction.h | 4 +- .../displaywindow/cbiblereadwindow.cpp | 51 +- src/frontend/displaywindow/cbiblereadwindow.h | 19 +- .../displaywindow/cbookreadwindow.cpp | 25 +- src/frontend/displaywindow/cbookreadwindow.h | 10 +- src/frontend/displaywindow/cbuttons.cpp | 26 +- src/frontend/displaywindow/cbuttons.h | 11 +- .../displaywindow/ccommentaryreadwindow.cpp | 28 +- .../displaywindow/ccommentaryreadwindow.h | 10 +- src/frontend/displaywindow/cdisplaywindow.cpp | 61 +- src/frontend/displaywindow/cdisplaywindow.h | 28 +- .../displaywindow/cdisplaywindowfactory.cpp | 41 +- .../displaywindow/cdisplaywindowfactory.h | 28 +- .../displaywindow/chtmlwritewindow.cpp | 42 +- src/frontend/displaywindow/chtmlwritewindow.h | 11 +- .../displaywindow/clexiconreadwindow.cpp | 70 +- .../displaywindow/clexiconreadwindow.h | 12 +- .../displaywindow/cmodulechooserbar.cpp | 10 +- .../displaywindow/cmodulechooserbar.h | 8 +- .../displaywindow/cmodulechooserbutton.cpp | 31 +- .../displaywindow/cmodulechooserbutton.h | 9 +- .../displaywindow/cplainwritewindow.cpp | 43 +- .../displaywindow/cplainwritewindow.h | 8 +- src/frontend/displaywindow/creadwindow.cpp | 34 +- src/frontend/displaywindow/creadwindow.h | 7 +- src/frontend/displaywindow/cwritewindow.cpp | 15 +- src/frontend/displaywindow/cwritewindow.h | 8 +- src/frontend/htmldialogs/btaboutdialog.cpp | 43 +- src/frontend/htmldialogs/btaboutdialog.h | 5 +- src/frontend/htmldialogs/bttabhtmldialog.cpp | 19 +- src/frontend/htmldialogs/bttabhtmldialog.h | 2 + src/frontend/keychooser/bthistory.cpp | 42 +- src/frontend/keychooser/bthistory.h | 25 +- src/frontend/keychooser/cbookkeychooser.cpp | 17 +- src/frontend/keychooser/cbookkeychooser.h | 10 +- src/frontend/keychooser/cbooktreechooser.cpp | 23 +- src/frontend/keychooser/cbooktreechooser.h | 20 +- src/frontend/keychooser/ckeychooser.cpp | 22 +- src/frontend/keychooser/ckeychooser.h | 12 +- src/frontend/keychooser/ckeychooserwidget.cpp | 25 +- src/frontend/keychooser/ckeychooserwidget.h | 12 +- .../keychooser/clexiconkeychooser.cpp | 25 +- src/frontend/keychooser/clexiconkeychooser.h | 14 +- src/frontend/keychooser/cscrollbutton.cpp | 7 +- src/frontend/keychooser/cscrollbutton.h | 8 +- .../keychooser/cscrollerwidgetset.cpp | 8 +- src/frontend/keychooser/cscrollerwidgetset.h | 10 +- .../btdropdownchooserbutton.cpp | 11 +- .../versekeychooser/btdropdownchooserbutton.h | 2 +- .../versekeychooser/btversekeymenu.cpp | 8 +- .../versekeychooser/btversekeymenu.h | 1 + .../versekeychooser/cbiblekeychooser.cpp | 33 +- .../versekeychooser/cbiblekeychooser.h | 13 +- .../versekeychooser/ckeyreferencewidget.cpp | 49 +- .../versekeychooser/ckeyreferencewidget.h | 13 +- .../mainindex/bookmarks/btbookmarkfolder.cpp | 22 +- .../mainindex/bookmarks/btbookmarkfolder.h | 4 +- .../mainindex/bookmarks/btbookmarkitem.cpp | 21 +- .../mainindex/bookmarks/btbookmarkitem.h | 4 +- .../bookmarks/btbookmarkitembase.cpp | 7 +- .../mainindex/bookmarks/btbookmarkitembase.h | 9 +- .../mainindex/bookmarks/btbookmarkloader.cpp | 28 +- .../mainindex/bookmarks/btbookmarkloader.h | 6 +- .../mainindex/bookmarks/cbookmarkindex.cpp | 123 +- .../mainindex/bookmarks/cbookmarkindex.h | 31 +- src/frontend/mainindex/bookshelf/actionenum.h | 24 - .../mainindex/bookshelf/btindexfolder.cpp | 18 - .../mainindex/bookshelf/btindexfolder.h | 29 - .../mainindex/bookshelf/btindexitem.cpp | 18 - .../mainindex/bookshelf/btindexitem.h | 47 - .../mainindex/bookshelf/btindexmodule.cpp | 89 - .../mainindex/bookshelf/btindexmodule.h | 38 - .../mainindex/bookshelf/cbookshelfindex.cpp | 714 - .../mainindex/bookshelf/cbookshelfindex.h | 206 - .../bookshelf/chidemodulechooserdialog.cpp | 68 - .../bookshelf/chidemodulechooserdialog.h | 42 - src/frontend/mainindex/btbookshelfview.cpp | 1 + src/frontend/mainindex/btbookshelfview.h | 1 + src/frontend/profile/cprofile.cpp | 97 +- src/frontend/profile/cprofile.h | 35 +- src/frontend/profile/cprofilemgr.cpp | 11 +- src/frontend/profile/cprofilemgr.h | 9 +- src/frontend/profile/cprofilewindow.cpp | 12 +- src/frontend/profile/cprofilewindow.h | 13 +- .../analysis/csearchanalysisdialog.cpp | 18 +- .../analysis/csearchanalysisdialog.h | 9 +- .../analysis/csearchanalysisitem.cpp | 11 +- .../analysis/csearchanalysisitem.h | 8 +- .../analysis/csearchanalysislegenditem.cpp | 10 +- .../analysis/csearchanalysislegenditem.h | 7 +- .../analysis/csearchanalysisscene.cpp | 21 +- .../analysis/csearchanalysisscene.h | 16 +- .../analysis/csearchanalysisview.cpp | 6 +- .../analysis/csearchanalysisview.h | 2 + .../searchdialog/btsearchoptionsarea.cpp | 61 +- .../searchdialog/btsearchoptionsarea.h | 14 +- .../searchdialog/btsearchresultarea.cpp | 59 +- .../searchdialog/btsearchresultarea.h | 17 +- .../searchdialog/chistorycombobox.cpp | 6 +- src/frontend/searchdialog/chistorycombobox.h | 1 + .../searchdialog/cmoduleresultview.cpp | 91 +- src/frontend/searchdialog/cmoduleresultview.h | 21 +- .../searchdialog/crangechooserdialog.cpp | 50 +- .../searchdialog/crangechooserdialog.h | 13 +- src/frontend/searchdialog/csearchdialog.cpp | 69 +- src/frontend/searchdialog/csearchdialog.h | 20 +- .../csearchmodulechooserdialog.cpp | 26 +- .../searchdialog/csearchmodulechooserdialog.h | 25 +- .../searchdialog/csearchresultview.cpp | 42 +- src/frontend/searchdialog/csearchresultview.h | 6 +- .../settingsdialogs/btshortcutsdialog.cpp | 19 +- .../settingsdialogs/btshortcutsdialog.h | 2 +- .../settingsdialogs/btshortcutseditor.cpp | 22 +- .../settingsdialogs/btshortcutseditor.h | 4 +- .../settingsdialogs/cacceleratorsettings.cpp | 24 +- .../settingsdialogs/cacceleratorsettings.h | 16 +- .../settingsdialogs/cconfigurationdialog.cpp | 23 +- .../settingsdialogs/cconfigurationdialog.h | 30 +- .../settingsdialogs/cdisplaysettings.cpp | 25 +- .../settingsdialogs/cdisplaysettings.h | 3 +- src/frontend/settingsdialogs/cfontchooser.cpp | 13 +- src/frontend/settingsdialogs/cfontchooser.h | 32 +- .../settingsdialogs/clanguagesettings.cpp | 65 +- .../settingsdialogs/clanguagesettings.h | 35 +- src/frontend/settingsdialogs/clistwidget.cpp | 10 +- src/frontend/settingsdialogs/clistwidget.h | 21 +- .../settingsdialogs/cswordsettings.cpp | 48 +- src/frontend/settingsdialogs/cswordsettings.h | 29 +- src/main.cpp | 80 +- src/tests/backend/config/cbtconfig_test.cpp | 3 +- src/tests/bibletime_test.cpp | 1 + src/tests/bibletime_test.h | 1 + src/util/cpointers.cpp | 8 +- src/util/cpointers.h | 3 +- src/util/cresmgr.cpp | 7 +- src/util/cresmgr.h | 11 +- src/util/ctoolclass.h | 94 - src/util/dialogutil.cpp | 85 +- src/util/dialogutil.h | 45 +- src/util/{directoryutil.cpp => directory.cpp} | 393 +- src/util/directory.h | 135 + src/util/directoryutil.h | 112 - src/util/migrationutil.cpp | 36 +- src/util/migrationutil.h | 37 +- src/util/{ctoolclass.cpp => tool.cpp} | 85 +- src/util/tool.h | 80 + 848 files changed, 36846 insertions(+), 70215 deletions(-) create mode 100644 cmake/BTCpack.cmake create mode 100644 cmake/BTDeveloper.cmake create mode 100644 cmake/BTDocumentation.cmake rename cmake/{bibletime_source_list.cmake => BTSourceFileList.cmake} (93%) create mode 100644 cmake/BTWinIcon.rc delete mode 100644 cmake/config.h.cmake create mode 100644 cmake/platforms/windows/README.txt create mode 100644 cmake/platforms/windows/filemgr.cpp rename docs/handbook/cs/html/{hdbk-reference-hotkeys.html => hdbk-reference-shortcuts.html} (81%) delete mode 100644 docs/handbook/cs/html/hdbk-reference-toolbar.html rename docs/handbook/de/html/{hdbk-reference-hotkeys.html => hdbk-reference-shortcuts.html} (95%) delete mode 100644 docs/handbook/de/html/hdbk-reference-toolbar.html rename docs/handbook/en/html/{hdbk-reference-hotkeys.html => hdbk-reference-shortcuts.html} (86%) delete mode 100644 docs/handbook/en/html/hdbk-reference-toolbar.html create mode 100644 docs/handbook/en/html/ss_shortcuts.png rename docs/handbook/fi/html/{hdbk-reference-hotkeys.html => hdbk-reference-shortcuts.html} (82%) delete mode 100644 docs/handbook/fi/html/hdbk-reference-toolbar.html rename docs/handbook/fr/html/{hdbk-reference-hotkeys.html => hdbk-reference-shortcuts.html} (82%) delete mode 100644 docs/handbook/fr/html/hdbk-reference-toolbar.html rename docs/handbook/hu/html/{hdbk-reference-hotkeys.html => hdbk-reference-shortcuts.html} (77%) delete mode 100644 docs/handbook/hu/html/hdbk-reference-toolbar.html rename docs/handbook/nl/html/{hdbk-reference-hotkeys.html => hdbk-reference-shortcuts.html} (82%) delete mode 100644 docs/handbook/nl/html/hdbk-reference-toolbar.html rename docs/handbook/pt-br/html/{hdbk-reference-hotkeys.html => hdbk-reference-shortcuts.html} (82%) rename i18n/messages/{bibletime_ui_ua.qm => bibletime_ui_uk.qm} (84%) rename i18n/messages/{bibletime_ui_ua.ts => bibletime_ui_uk.ts} (86%) create mode 100644 pics/icons/bibletime.ico create mode 100644 src/backend/bookshelfmodel/btmodulecategoryfilterproxymodel.cpp create mode 100644 src/backend/bookshelfmodel/btmodulecategoryfilterproxymodel.h create mode 100644 src/backend/bookshelfmodel/btmodulehiddenfilterproxymodel.cpp create mode 100644 src/backend/bookshelfmodel/btmodulehiddenfilterproxymodel.h create mode 100644 src/backend/filters/bt_teihtml.cpp create mode 100644 src/backend/filters/bt_teihtml.h delete mode 100644 src/backend/managers/creferencemanager.h rename src/backend/managers/{creferencemanager.cpp => referencemanager.cpp} (85%) create mode 100644 src/backend/managers/referencemanager.h delete mode 100644 src/frontend/cdragdropmgr.cpp delete mode 100644 src/frontend/cdragdropmgr.h delete mode 100644 src/frontend/mainindex/bookshelf/actionenum.h delete mode 100644 src/frontend/mainindex/bookshelf/btindexfolder.cpp delete mode 100644 src/frontend/mainindex/bookshelf/btindexfolder.h delete mode 100644 src/frontend/mainindex/bookshelf/btindexitem.cpp delete mode 100644 src/frontend/mainindex/bookshelf/btindexitem.h delete mode 100644 src/frontend/mainindex/bookshelf/btindexmodule.cpp delete mode 100644 src/frontend/mainindex/bookshelf/btindexmodule.h delete mode 100644 src/frontend/mainindex/bookshelf/cbookshelfindex.cpp delete mode 100644 src/frontend/mainindex/bookshelf/cbookshelfindex.h delete mode 100644 src/frontend/mainindex/bookshelf/chidemodulechooserdialog.cpp delete mode 100644 src/frontend/mainindex/bookshelf/chidemodulechooserdialog.h delete mode 100644 src/util/ctoolclass.h rename src/util/{directoryutil.cpp => directory.cpp} (60%) create mode 100644 src/util/directory.h delete mode 100644 src/util/directoryutil.h rename src/util/{ctoolclass.cpp => tool.cpp} (76%) create mode 100644 src/util/tool.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f4e0d6..2c4f306 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,439 +1,302 @@ -PROJECT(bibletime CXX C) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) - -#Version -ADD_DEFINITIONS(-DBT_VERSION="2.3.3") - -#Non-English locales to be processed and installed for UI, handbook and howto -LIST(APPEND MESSAGE_LOCALE_LANGS af bg cs da de en_GB es et fi fr hu it ko nl nn_NO no pl pt_br ro ru sk sv ua vi zh_CN zh_TW) -#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 cs de fi fr hu nl pt-br) -LIST(APPEND HOWTO_LOCALE_LANGS bg cs da de es fi fr it hu ko nl pt-br ru) - -###################################################### -# Find required packages -# -SET(QT_MIN_VERSION 4.4.0) -SET(QT_USE_QTXML 1) -SET(QT_USE_QTWEBKIT 1) -FIND_PACKAGE(Qt4 REQUIRED) -IF (QT_QTDBUS_FOUND AND NOT APPLE) - SET(QT_USE_QTDBUS 1) - MESSAGE("Using DBUS") -ELSE (QT_QTDBUS_FOUND AND NOT APPLE) - ADD_DEFINITIONS(-DNO_DBUS) - MESSAGE("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? - -FIND_PACKAGE(Boost REQUIRED) -# -#custom includes -# -SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -FIND_PACKAGE(CLucene REQUIRED) - -# optional: Try to detect CURL and add it to the linker flags if found, maybe Sword needs it -FIND_PACKAGE(CURL) -# optional: Try to detect ICU and add it to the linker flags if found, maybe Sword needs it -FIND_PACKAGE(ICU) -# optional: Try to detect ZLib and add it to the linker flags if found, maybe Sword needs it -FIND_PACKAGE(ZLIB) - -FIND_PACKAGE(Sword REQUIRED) -###################################################### - - -###################################################### -# Define $bibletime_SOURCES -# -INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/bibletime_source_list.cmake") -# -# Generate config.h -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h") -###################################################### - - -###################################################### -# The actual build options -# -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 - ${Boost_INCLUDE_DIRS} - ${SWORD_INCLUDE_DIR} -) - - -# this will run uic on .ui files: -QT4_WRAP_UI(bibletime_UIS_H ${bibletime_UIS}) - -# -#This must come before the target definition! -LINK_DIRECTORIES( - ${CLUCENE_LIBRARY_DIR} - ${SWORD_LIBRARY_DIR} -) - -IF(APPLE) - SET(EXECUTABLE_NAME "BibleTime") -ELSE(APPLE) - SET(EXECUTABLE_NAME "bibletime") -ENDIF(APPLE) - -#Link to QtTest only in debug builds -IF (CMAKE_BUILD_TYPE STREQUAL "Release") - # this will run moc on source files - QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS}) - ADD_EXECUTABLE(${EXECUTABLE_NAME} ${bibletime_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES}) -# SET_TARGET_PROPERTIES(${EXECUTABLE_NAME} -# PROPERTIES -# COMPILE_FLAGS "${SWORD_CFLAGS}" #Enable exception handling -# ) - 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} - ) -ELSE (CMAKE_BUILD_TYPE STREQUAL "Release") - # this will run moc on source files - QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS}) - QT4_WRAP_CPP(bibletime_test_MOC_SOURCES ${bibletime_test_MOCABLE_HEADERS}) - SET(CMAKE_BUILD_TYPE "Debug") - ADD_EXECUTABLE(${EXECUTABLE_NAME} ${bibletime_SOURCES} - ${bibletime_test_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES} ${bibletime_test_MOC_SOURCES}) - SET_TARGET_PROPERTIES(${EXECUTABLE_NAME} - PROPERTIES - COMPILE_FLAGS "-DBT_ENABLE_TESTING" #Enable exception handling and Testing - ) - SET(QT_USE_QTTEST 1) - INCLUDE(${QT_USE_FILE}) - TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} - ${QT_LIBRARIES} - ${QT_LIBRARIES_DEBUG} - ${CLUCENE_LIBRARY} - ${CURL_LIBRARIES} # optional, empty if not found - ${ICU_LIBRARIES} # optional, empty if not found - ${ICU_I18N_LIBRARIES} # optional, empty if not found - ${SWORD_LIBRARY} - ) - # Unit Tests - ADD_CUSTOM_TARGET(test - COMMAND ./${EXECUTABLE_NAME} --run-tests - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - COMMENT "Running BibleTime Unit Tests" - ) -ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release") - -IF(USE_QT_WEB_KIT) - SET_SOURCE_FILES_PROPERTIES( ${bibletime_SOURCES} COMPILE_FLAGS -DUSE_QTWEBKIT ) -ENDIF(USE_QT_WEB_KIT) - - -###################################################### - -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 (MSVC) - SET(CMAKE_CXX_FLAGS_RELEASE "-DNO_DBUS -DSWUSINGDLL -DBT_VERSION=\\\"${BT_VERSION}\\\" /MD /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE ") - SET(CMAKE_CXX_FLAGS_DEBUG "-DNO_DBUS -DSWUSINGDLL -DBT_VERSION=\\\"${BT_VERSION}\\\" /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE -DBT_ENABLE_TESTING /ZI") -ELSE (MSVC) - SET(CMAKE_CXX_FLAGS_RELEASE "-W -O2 -fexceptions") - SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror -O0 -g -fexceptions -DBT_ENABLE_TESTING") -ENDIF (MSVC) - - -###################################################### -# Install files -# -SET (BT_DESTINATION "bin/") -SET (BT_SHARE_PATH "") - -INSTALL(TARGETS "${EXECUTABLE_NAME}" - DESTINATION "${BT_DESTINATION}" -) - -# compiled catalogs -FOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS}) - INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui_${MESSAGE_LOCALE_LANG}.qm" - DESTINATION "${BT_SHARE_PATH}share/bibletime/locale/" - ) -ENDFOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS}) -# icons -FILE(GLOB INSTALL_ICONS_LIST "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/*.svg") -INSTALL(FILES ${INSTALL_ICONS_LIST} - DESTINATION "${BT_SHARE_PATH}share/bibletime/icons/" -) -# icons - png, needed for About Dialog -FILE(GLOB INSTALL_ICONS_LIST_PNG "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/bibletime.png") -INSTALL(FILES ${INSTALL_ICONS_LIST_PNG} - DESTINATION "${BT_SHARE_PATH}share/bibletime/icons/" -) -# display templates -FILE(GLOB INSTALL_DISPLAY_TEMPLATES_LIST ${CMAKE_CURRENT_SOURCE_DIR}/src/display-templates/*.tmpl) -INSTALL(FILES ${INSTALL_DISPLAY_TEMPLATES_LIST} - DESTINATION "${BT_SHARE_PATH}share/bibletime/display-templates/" -) -# javascript -INSTALL(FILES "src/frontend/display/bthtml.js" - DESTINATION "${BT_SHARE_PATH}share/bibletime/javascript/" -) -# license.html -INSTALL(FILES "docs/license.html" - DESTINATION "${BT_SHARE_PATH}share/bibletime/license/" -) -# splash screen -INSTALL(FILES "pics/startuplogo.png" - DESTINATION "${BT_SHARE_PATH}share/bibletime/pics/" -) -#handbook (install images from en/ to all languages) -FILE(GLOB INSTALL_HANDBOOK_IMAGES "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/en/html/*.png") -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}share/bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/" - ) - INSTALL(FILES ${INSTALL_HANDBOOK_IMAGES} - DESTINATION "${BT_SHARE_PATH}share/bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/" - ) -ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en") -#howto (does not have images) -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}share/bibletime/docs/howto/${HOWTO_LOCALE_LANG}/" - ) -ENDFOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en") -# -# Platform specific installation -# -# LINUX: application icon -INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/bibletime.svg" - DESTINATION "${BT_SHARE_PATH}share/icons/" -) -# LINUX: desktop file -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/linux/bibletime.desktop.cmake" "${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop") -INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop" - DESTINATION "${BT_SHARE_PATH}share/applications/" -) -###################################################### - - -###################################################### -# 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 lupdate "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui_${MESSAGE_LOCALE_LANG}.ts") - ADD_CUSTOM_TARGET("compile_messages_${MESSAGE_LOCALE_LANG}" - COMMAND lrelease "bibletime_ui_${MESSAGE_LOCALE_LANG}.ts" -qm "bibletime_ui_${MESSAGE_LOCALE_LANG}.qm" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/") - ADD_DEPENDENCIES("compile_messages_${MESSAGE_LOCALE_LANG}" "messages_${MESSAGE_LOCALE_LANG}") - ADD_DEPENDENCIES("messages" "compile_messages_${MESSAGE_LOCALE_LANG}") -ENDFOREACH(MESSAGE_LOCALE_LANG) -# Template file for translators -ADD_CUSTOM_TARGET("messages_default" - COMMAND lupdate "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui.ts") -ADD_DEPENDENCIES(messages "messages_default") -###################################################### - -###################################################### -# Update handbook -ADD_CUSTOM_TARGET("handbook") - -ADD_CUSTOM_TARGET("handbook_translations" - COMMAND po4a -v --no-backups -k 0 cmake/docs/handbook_po4a.conf - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") - -FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en") - ADD_CUSTOM_TARGET("handbook_${HANDBOOK_LOCALE_LANG}" - COMMAND xsltproc --stringparam l10n.gentext.default.language ${HANDBOOK_LOCALE_LANG} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs.xsl ../docbook/index.docbook - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/${HANDBOOK_LOCALE_LANG}/html/") - ADD_DEPENDENCIES("handbook_${HANDBOOK_LOCALE_LANG}" "handbook_translations") - ADD_DEPENDENCIES("handbook" "handbook_${HANDBOOK_LOCALE_LANG}") -ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS}) -###################################################### - -###################################################### -# Update howto -ADD_CUSTOM_TARGET("howto") -ADD_CUSTOM_TARGET("howto_translations" - COMMAND po4a -v --no-backups -k 0 cmake/docs/howto_po4a.conf - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") -ADD_DEPENDENCIES("howto" "howto_translations") - -FOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en") - ADD_CUSTOM_TARGET("howto_${HOWTO_LOCALE_LANG}" - COMMAND xsltproc "${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs.xsl" "../docbook/index.docbook" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/howto/${HOWTO_LOCALE_LANG}/html/") - ADD_DEPENDENCIES("howto_${HOWTO_LOCALE_LANG}" "howto_translations") - ADD_DEPENDENCIES("howto" "howto_${HOWTO_LOCALE_LANG}") -ENDFOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS}) - -###################################################### - -###################################################### -# "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 - ) -ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -###################################################### - - -###################################################### -# Developer section -# -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 -) -###################################################### - - - -###################################################### -# This is the CPack section -# Copied and modified from http://www.vtk.org/Wiki/CMake:Packaging_With_CPack - -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BibleTime for Windows Beta") -SET(CPACK_PACKAGE_VENDOR "http://www.bibletime.info") -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "3") -SET(CPACK_PACKAGE_VERSION_PATCH "2") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "BibleTime") - -###################################################### -# Windows segment -###################################################### -IF(WIN32 AND NOT UNIX) - SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") - SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") - # There is a bug in NSI that does not handle full unix paths properly. Make - # 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) - INSTALL(FILES - "${QT_LIBRARY_DIR}/QtWebKitd4.dll" - "${QT_LIBRARY_DIR}/QtGuid4.dll" - "${QT_LIBRARY_DIR}/QtXmld4.dll" - "${QT_LIBRARY_DIR}/QtTestd4.dll" - "${QT_LIBRARY_DIR}/QtNetworkd4.dll" - "${QT_LIBRARY_DIR}/QtCored4.dll" - "${QT_LIBRARY_DIR}/phonond4.dll" - "${QT_LIBRARY_DIR}/QtSvgd4.dll" - DESTINATION "${BT_DESTINATION}" - CONFIGURATIONS "Debug" - ) - INSTALL(FILES - "${QT_LIBRARY_DIR}/QtWebKit4.dll" - "${QT_LIBRARY_DIR}/QtGui4.dll" - "${QT_LIBRARY_DIR}/QtXml4.dll" - "${QT_LIBRARY_DIR}/QtTest4.dll" - "${QT_LIBRARY_DIR}/QtNetwork4.dll" - "${QT_LIBRARY_DIR}/QtCore4.dll" - "${QT_LIBRARY_DIR}/phonon4.dll" - "${QT_LIBRARY_DIR}/QtSvg4.dll" - DESTINATION "${BT_DESTINATION}" - CONFIGURATIONS "Release" - ) - - # Qt Plugins - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/iconengines" "${QT_PLUGINS_DIR}/imageformats" DESTINATION "${BT_DESTINATION}/plugins") - - # This adds in the required Windows system libraries and libsword.dll - INCLUDE(InstallRequiredSystemLibraries) - STRING(REPLACE ".lib" ".dll" SWORD_DLL "${SWORD_LIBRARY}") - INSTALL(FILES ${SWORD_DLL} DESTINATION ${BT_DESTINATION}) # This will also take effect in the regular install - - # Some options for the CPack system. These should be pretty self-evident - SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\pics\\\\icons\\\\bibletime.png") - SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\bibletime.exe") - SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} for Windows") - SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.bibletime.info") - SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.bibletime.info") - SET(CPACK_NSIS_CONTACT "bt-devel@crosswire.org") - SET(CPACK_NSIS_MODIFY_PATH OFF) - SET(CPACK_GENERATOR "NSIS") -#################################### -# Apple Segment -#################################### -ELSEIF(APPLE) - INCLUDE(${QT_USE_FILE}) - SET(QT_FRAMEWORKS_USED "QtWebKit" - "QtGui" - "QtXml" - "QtTest" - "QtNetwork" - "QtCore" - "QtSvg") - FOREACH(QT_FRAME ${QT_FRAMEWORKS_USED}) - INSTALL(DIRECTORY - "${QT_LIBRARY_DIR}/${QT_FRAME}.framework" - DESTINATION "${BT_DESTINATION}/../Library/Frameworks/") - ENDFOREACH(QT_FRAME ${QT_FRAMEWORKS_USED}) - # Other libraries I need - INSTALL(FILES "${CLUCENE_LIBRARY}" - "${CLUCENE_LIBRARY_DIR}/libclucene.0.0.0.dylib" - "${CLUCENE_LIBRARY_DIR}/libclucene.0.dylib" - "/opt/local/lib/libcurl.4.dylib" - "/opt/local/lib/libssl.0.9.8.dylib" - "/opt/local/lib/libcrypto.0.9.8.dylib" - "/opt/local/lib/libicui18n.40.dylib" - "/opt/local/lib/libicui18n.40.0.dylib" - "/opt/local/lib/libicuuc.40.dylib" - "/opt/local/lib/libicuuc.40.0.dylib" - "/opt/local/lib/libicuio.40.dylib" - "/opt/local/lib/libicuio.40.0.dylib" - "/opt/local/lib/libicudata.40.dylib" - "/opt/local/lib/libicudata.40.0.dylib" - "/opt/local/lib/libpng12.0.dylib" - DESTINATION "${BT_DESTINATION}/../Library") - - # Qt Plugins - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/iconengines" "${QT_PLUGINS_DIR}/imageformats" DESTINATION "${BT_DESTINATION}/../../plugins") - # A file to execute that might get rid of the above mess - SET(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/bt_start.sh") - SET(CPACK_BUNDLE_NAME "BibleTime") - SET(CPACK_PACKAGE_FILE_NAME "BibleTime_Mac_Beta") - SET(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/Info.plist") - SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/BibleTime.icns") - SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/BibleTime.icns") - SET(CPACK_GENERATOR "Bundle") -ENDIF(WIN32 AND NOT UNIX) - -SET(CPACK_PACKAGE_EXECUTABLES "bibletime" "BibleTime") - -INCLUDE(CPack) +PROJECT(bibletime CXX C) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) + +SET(BT_WC_REVISION "0") +IF (EXISTS ${PROJECT_SOURCE_DIR}/.svn) + # Probably a SVN workspace, determine revision level + FIND_PACKAGE(Subversion) + IF(Subversion_FOUND) + Subversion_WC_INFO(${PROJECT_SOURCE_DIR} BT) + MESSAGE(STATUS "Current revision is ${BT_WC_REVISION}") + ENDIF(Subversion_FOUND) +ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/.svn) + +#Version +SET (BT_VERSION_MAJOR "2") +SET (BT_VERSION_MINOR "4") +#SET (BT_REVISION_PATCH "+svnr${BT_WC_REVISION}") +SET (BT_REVISION_PATCH "") +ADD_DEFINITIONS(-DBT_SVN_REVISION="${SVN_REVISION}") +ADD_DEFINITIONS(-DBT_VERSION="${BT_VERSION_MAJOR}.${BT_VERSION_MINOR}${BT_REVISION_PATCH}") + +MESSAGE(STATUS "Setting up build environment for BibleTime version ${BT_VERSION_MAJOR}.${BT_VERSION_MINOR}${BT_REVISION_PATCH}") + +#Non-English locales to be processed and installed for UI, handbook and howto +LIST(APPEND MESSAGE_LOCALE_LANGS af bg cs da de en_GB es et fi fr hu it ko nl nn_NO no pl pt_br ro ru sk sv uk vi zh_CN zh_TW) +#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 cs de fi fr hu nl pt-br) +LIST(APPEND HOWTO_LOCALE_LANGS bg cs da de es fi fr it hu ko nl pt-br ru) + +###################################################### +# Find required packages +# +SET(QT_MIN_VERSION 4.4.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(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? + +FIND_PACKAGE(Boost REQUIRED) +# +#custom includes +# +SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +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) +###################################################### + + +###################################################### +# Define $bibletime_SOURCES +INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake") +###################################################### + + +###################################################### +# The actual build options +# +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 + ${Boost_INCLUDE_DIRS} + ${SWORD_INCLUDE_DIR} +) + +# this will run uic on .ui files: +QT4_WRAP_UI(bibletime_UIS_H ${bibletime_UIS}) + +#This must come before the target definition! +LINK_DIRECTORIES( + ${CLUCENE_LIBRARY_DIR} + ${SWORD_LIBRARY_DIR} +) + +SET(EXECUTABLE_NAME "bibletime") +IF(APPLE) + SET(EXECUTABLE_NAME "BibleTime") +ENDIF(APPLE) + +# For the Windows Application Icon +SET (bibletime_RC cmake/BTWinIcon.rc) + +#Link to QtTest only in debug builds +IF (CMAKE_BUILD_TYPE STREQUAL "Release") + # this will run moc on source files + QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS}) + IF (MSVC) + ADD_EXECUTABLE(${EXECUTABLE_NAME} WIN32 ${bibletime_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES} ${bibletime_RC}) + ELSE (MSVC) + ADD_EXECUTABLE(${EXECUTABLE_NAME} ${bibletime_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES}) + ENDIF (MSVC) +# SET_TARGET_PROPERTIES(${EXECUTABLE_NAME} +# PROPERTIES +# COMPILE_FLAGS "${SWORD_CFLAGS}" #Enable exception handling +# ) + 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} + ) +ELSE (CMAKE_BUILD_TYPE STREQUAL "Release") + # this will run moc on source files + QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS}) + QT4_WRAP_CPP(bibletime_test_MOC_SOURCES ${bibletime_test_MOCABLE_HEADERS}) + SET(CMAKE_BUILD_TYPE "Debug") + IF (MSVC) + ADD_EXECUTABLE(${EXECUTABLE_NAME} WIN32 ${bibletime_SOURCES} + ${bibletime_test_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES} ${bibletime_test_MOC_SOURCES} ${bibletime_RC}) + ELSE (MSVC) + ADD_EXECUTABLE(${EXECUTABLE_NAME} ${bibletime_SOURCES} + ${bibletime_test_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES} ${bibletime_test_MOC_SOURCES}) + ENDIF (MSVC) + SET_TARGET_PROPERTIES(${EXECUTABLE_NAME} + PROPERTIES + COMPILE_FLAGS "-DBT_ENABLE_TESTING" #Enable exception handling and Testing + ) + SET(QT_USE_QTTEST 1) + 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 + ${SWORD_LIBRARY} + ) + # Unit Tests + ADD_CUSTOM_TARGET(test + COMMAND ./${EXECUTABLE_NAME} --run-tests + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + COMMENT "Running BibleTime Unit Tests" + ) +ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release") + +IF(USE_QT_WEB_KIT) + SET_SOURCE_FILES_PROPERTIES( ${bibletime_SOURCES} COMPILE_FLAGS -DUSE_QTWEBKIT ) +ENDIF(USE_QT_WEB_KIT) + +SOURCE_GROUP( "Generated Files" + FILES ${bibletime_UIS} ${bibletime_MOC_SOURCES} +) + + +###################################################### + +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 (MSVC) + SET(CMAKE_CXX_FLAGS_RELEASE "-DNO_DBUS -DSWUSINGDLL -DBT_VERSION=\\\"${BT_VERSION}\\\" /MD /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE ") + SET(CMAKE_CXX_FLAGS_DEBUG "-DNO_DBUS -DSWUSINGDLL -DBT_VERSION=\\\"${BT_VERSION}\\\" /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE -DBT_ENABLE_TESTING /ZI") +ELSE (MSVC) + SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -fexceptions") + SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror -O0 -g -fexceptions -DBT_ENABLE_TESTING") +ENDIF (MSVC) + + +###################################################### +# Install files +# +SET (BT_DESTINATION "bin/") +SET (BT_SHARE_PATH "") + +INSTALL(TARGETS "${EXECUTABLE_NAME}" + DESTINATION "${BT_DESTINATION}" +) + +# compiled catalogs +FOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS}) + INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui_${MESSAGE_LOCALE_LANG}.qm" + DESTINATION "${BT_SHARE_PATH}share/bibletime/locale/" + ) +ENDFOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS}) +# icons +FILE(GLOB INSTALL_ICONS_LIST "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/*.svg") +INSTALL(FILES ${INSTALL_ICONS_LIST} + DESTINATION "${BT_SHARE_PATH}share/bibletime/icons/" +) +# icons - png, needed for About Dialog +FILE(GLOB INSTALL_ICONS_LIST_PNG "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/bibletime.png") +INSTALL(FILES ${INSTALL_ICONS_LIST_PNG} + DESTINATION "${BT_SHARE_PATH}share/bibletime/icons/" +) +# display templates +FILE(GLOB INSTALL_DISPLAY_TEMPLATES_LIST ${CMAKE_CURRENT_SOURCE_DIR}/src/display-templates/*.tmpl) +INSTALL(FILES ${INSTALL_DISPLAY_TEMPLATES_LIST} + DESTINATION "${BT_SHARE_PATH}share/bibletime/display-templates/" +) +# javascript +INSTALL(FILES "src/frontend/display/bthtml.js" + DESTINATION "${BT_SHARE_PATH}share/bibletime/javascript/" +) +# license.html +INSTALL(FILES "docs/license.html" + DESTINATION "${BT_SHARE_PATH}share/bibletime/license/" +) +# splash screen +INSTALL(FILES "pics/startuplogo.png" + DESTINATION "${BT_SHARE_PATH}share/bibletime/pics/" +) +#handbook (install images from en/ to all languages) +FILE(GLOB INSTALL_HANDBOOK_IMAGES "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/en/html/*.png") +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}share/bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/" + ) + INSTALL(FILES ${INSTALL_HANDBOOK_IMAGES} + DESTINATION "${BT_SHARE_PATH}share/bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/" + ) +ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en") +#howto (does not have images) +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}share/bibletime/docs/howto/${HOWTO_LOCALE_LANG}/" + ) +ENDFOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en") +# +# Platform specific installation +# +# LINUX: application icon +INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/bibletime.svg" + DESTINATION "${BT_SHARE_PATH}share/icons/" +) +# LINUX: desktop file +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/linux/bibletime.desktop.cmake" "${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop") +INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop" + DESTINATION "${BT_SHARE_PATH}share/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}share/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) +###################################################### + +###################################################### +# define helper targets for documentation management +INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTDocumentation.cmake") +###################################################### + +###################################################### + +###################################################### +# "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 + ) +ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +###################################################### + +###################################################### +# Developer section +INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTDeveloper.cmake") +###################################################### + +###################################################### +# Cpack section +INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTCpack.cmake") +###################################################### + diff --git a/ChangeLog b/ChangeLog index abbeb25..7f2bbba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,39 +1,91 @@ -2009-10-27 Martin Gruner - * Release 2.3.3 +2009-11-18 Martin Gruner + * Release 2.4 -2009-10-26 Jaak Ristioja - * Backported showing locked icons in the bookshelf dock. - * Backported lexicon category having wrong icon fix. +2009-11-16 Gary Holmlund + * Fix window redraw errors in manual arrangement mode - ID: 2898356 + +2009-11-16 Jaak Ristioja + * Fixed vertical tiling. + +2009-11-14 Kang Sun + * Fixed highlighting of search results with ? wildcard. + +2009-11-14 Gary Holmlund + * Fix bug "Print->Reference wih text opens save dialog + * Fix Search dialog to close when BibleTime closes + +2009-11-14 Martin Gruner + * Bug-A-Thon II + * Improve search dialog robustness (fix crash when entering a keyword only) + * Fixed a bug where strongs parsing of search results did not work when searching in + more than one module. + * Fixed a bug where searching for more than one Strongs number from the read window + did not work correctly. + * Fixed a bug with rendering of single entries in Commentaries where the generated + HTML and JavaScript was broken (links firing several times, for example). + +2009-11-12 Gary Holmlund + * Fix defect: Cannot exit fullscreen mode - ID: 2895205 + +2009-11-11 Martin Gruner + * Include patch by kbs that fixes a memory leak. + * Improved support for alternative versifications. + * Release 2.4.rc1 + +2009-11-06 Eeli Kaikkonen + * Added "get list of install sources from server" functionality. + +2009-11-05 Gary Holmlund + * Fix crash when canceling bookshelf install + +2009-11-04 Martin Gruner + * Release 2.4.beta1 + +2009-11-1 Gary Holmlund + * Fix bug id 2890011 - Crash when making book/chapter/verse change 2009-10-24 Jaak Ristioja * Fixed a crash on module installation/uninstall. * Fixed the wrong icon for lexicons. * Fixed some (not all) memory leaks. + * Reimplemented showing locked icons for the bookshelf dock. + +2009-10-20 Martin Gruner + * Fixed bug: Apply display filters correctly when restoring profiles, like on startup. + * Refactoring: switched qDebug("text") to more current qDebug() << "text". + +2009-10-19 Martin Gruner + * Improved TEI filter (shows crossrefs correctly now). + * Fixed some text formatting settings in the display templates. + * Improved generated HTML a bit. + * Refactoring: Turned CToolClass into a namespace. Removed unused #includes of tool.h. -2009-10-14 Martin Gruner - * Release 2.3.2 +2009-10-18 Martin Gruner + * Added first version of TEI -> HTML filter. + BibleTime can now open TEI modules, though rendering has to be improved. 2009-10-13 Jaak Ristioja - * Backported bookshelf model category sorting fix. + * Fixed new bookshelf model category sorting. * Fixed a CSwordModuleInfo bug, which had unknown effects. * Reimplemented saving of bookshelf model grouping state. 2009-10-13 Martin Gruner - * Fixed nasty bug with incorrect footnote display in combination with - crossReferences in the same verse. + * Fixed nasty bug with incorrect footnote display in combination with + crossReferences in the same verse. 2009-10-10 Martin Gruner - * Reformatted codebase like in TRUNK a few days ago to be able to apply patches. - * Fixed bug #2849728: Lucene Text Fields search not working. Search now - correctly includes data from EntryAttributes as well as data from EntryAttributes - of entries with verse == 0. - -2009-10-06 Martin Gruner - * Release 2.3.1 + * Fixed bug #2849728: Lucene Text Fields search not working. Search now + correctly includes data from EntryAttributes as well as data from EntryAttributes + of entries with verse == 0. 2009-10-09 Jaak Ristioja * Fixed compilation for Qt 4.4 +2009-10-09 Martin Gruner + * Bug-a-thon + * Split CMakeLists.txt into pieces + * Reformat entire codebase with astyle + 2009-10-06 Martin Gruner * Release 2.3 diff --git a/cmake/BTCpack.cmake b/cmake/BTCpack.cmake new file mode 100644 index 0000000..e570a5d --- /dev/null +++ b/cmake/BTCpack.cmake @@ -0,0 +1,134 @@ +# This is the CPack section +# Copied and modified from http://www.vtk.org/Wiki/CMake:Packaging_With_CPack + +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_INSTALL_DIRECTORY "BibleTime") + +###################################################### +# Windows segment +###################################################### +IF(WIN32 AND NOT UNIX) + SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") + SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") + # There is a bug in NSI that does not handle full unix paths properly. Make + # 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) + INSTALL(FILES + "${QT_LIBRARY_DIR}/QtWebKitd4.dll" + "${QT_LIBRARY_DIR}/QtGuid4.dll" + "${QT_LIBRARY_DIR}/QtXmld4.dll" + "${QT_LIBRARY_DIR}/QtTestd4.dll" + "${QT_LIBRARY_DIR}/QtNetworkd4.dll" + "${QT_LIBRARY_DIR}/QtCored4.dll" + "${QT_LIBRARY_DIR}/phonond4.dll" + "${QT_LIBRARY_DIR}/QtSvgd4.dll" + DESTINATION "${BT_DESTINATION}" + CONFIGURATIONS "Debug" + ) + INSTALL(FILES + "${QT_LIBRARY_DIR}/QtWebKit4.dll" + "${QT_LIBRARY_DIR}/QtGui4.dll" + "${QT_LIBRARY_DIR}/QtXml4.dll" + "${QT_LIBRARY_DIR}/QtTest4.dll" + "${QT_LIBRARY_DIR}/QtNetwork4.dll" + "${QT_LIBRARY_DIR}/QtCore4.dll" + "${QT_LIBRARY_DIR}/phonon4.dll" + "${QT_LIBRARY_DIR}/QtSvg4.dll" + DESTINATION "${BT_DESTINATION}" + CONFIGURATIONS "Release" + ) + + # Qt Plugins + INSTALL(FILES + "${QT_PLUGINS_DIR}/iconengines/qsvgicon4.dll" + DESTINATION "${BT_DESTINATION}/plugins/iconengines" + CONFIGURATIONS "Release" + ) + INSTALL(FILES + "${QT_PLUGINS_DIR}/imageformats/qgif4.dll" + "${QT_PLUGINS_DIR}/imageformats/qico4.dll" + "${QT_PLUGINS_DIR}/imageformats/qjpeg4.dll" + "${QT_PLUGINS_DIR}/imageformats/qmng4.dll" + "${QT_PLUGINS_DIR}/imageformats/qsvg4.dll" + "${QT_PLUGINS_DIR}/imageformats/qtiff4.dll" + DESTINATION "${BT_DESTINATION}/plugins/imageformats" + CONFIGURATIONS "Release" + ) + + # This adds in the required Windows system libraries + INSTALL(PROGRAMS ${MSVC_REDIST} DESTINATION bin) + SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + ExecWait \\\"$INSTDIR\\\\bin\\\\vcredist_x86.exe /q:a\\\" + 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 + + # Some options for the CPack system. These should be pretty self-evident + SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\pics\\\\icons\\\\bibletime.png") + SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\bibletime.exe") + SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} for Windows") + SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.bibletime.info") + SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.bibletime.info") + SET(CPACK_NSIS_CONTACT "bt-devel@crosswire.org") + SET(CPACK_NSIS_MODIFY_PATH OFF) + SET(CPACK_GENERATOR "NSIS") +#################################### +# Apple Segment +#################################### +ELSEIF(APPLE) + INCLUDE(${QT_USE_FILE}) + SET(QT_FRAMEWORKS_USED "QtWebKit" + "QtGui" + "QtXml" + "QtTest" + "QtNetwork" + "QtCore" + "QtSvg") + FOREACH(QT_FRAME ${QT_FRAMEWORKS_USED}) + INSTALL(DIRECTORY + "${QT_LIBRARY_DIR}/${QT_FRAME}.framework" + DESTINATION "${BT_DESTINATION}/../Library/Frameworks/") + ENDFOREACH(QT_FRAME ${QT_FRAMEWORKS_USED}) + # Other libraries I need + INSTALL(FILES "${CLUCENE_LIBRARY}" + "${CLUCENE_LIBRARY_DIR}/libclucene.0.0.0.dylib" + "${CLUCENE_LIBRARY_DIR}/libclucene.0.dylib" + "/opt/local/lib/libcurl.4.dylib" + "/opt/local/lib/libssl.0.9.8.dylib" + "/opt/local/lib/libcrypto.0.9.8.dylib" +# "/opt/local/lib/libicui18n.40.dylib" +# "/opt/local/lib/libicui18n.40.0.dylib" +# "/opt/local/lib/libicuuc.40.dylib" +# "/opt/local/lib/libicuuc.40.0.dylib" +# "/opt/local/lib/libicuio.40.dylib" +# "/opt/local/lib/libicuio.40.0.dylib" +# "/opt/local/lib/libicudata.40.dylib" +# "/opt/local/lib/libicudata.40.0.dylib" + "/opt/local/lib/libpng12.0.dylib" + DESTINATION "${BT_DESTINATION}/../Library") + + # Qt Plugins + INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/iconengines" "${QT_PLUGINS_DIR}/imageformats" DESTINATION "${BT_DESTINATION}/../../plugins") + # A file to execute that might get rid of the above mess + SET(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/bt_start.sh") + SET(CPACK_BUNDLE_NAME "BibleTime") + SET(CPACK_PACKAGE_FILE_NAME "BibleTime_Mac_Beta") + SET(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/Info.plist") + SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/BibleTime.icns") + SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/BibleTime.icns") + SET(CPACK_GENERATOR "Bundle") +ENDIF(WIN32 AND NOT UNIX) + +SET(CPACK_PACKAGE_EXECUTABLES "bibletime" "BibleTime") + +INCLUDE(CPack) diff --git a/cmake/BTDeveloper.cmake b/cmake/BTDeveloper.cmake new file mode 100644 index 0000000..3293737 --- /dev/null +++ b/cmake/BTDeveloper.cmake @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000..9e7eca9 --- /dev/null +++ b/cmake/BTDocumentation.cmake @@ -0,0 +1,75 @@ +###################################################### +# Update source catalog files (this is the basis for the translator's work) +# Invoke this with "make messages" +# + +FIND_PROGRAM(QT_LUPDATE_EXECUTABLE + NAMES lupdate-qt4 lupdate + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH +) + +FIND_PROGRAM(QT_LRELEASE_EXECUTABLE + NAMES lrelease-qt4 lrelease + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH +) + +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_CUSTOM_TARGET("compile_messages_${MESSAGE_LOCALE_LANG}" + COMMAND ${QT_LRELEASE_EXECUTABLE} "bibletime_ui_${MESSAGE_LOCALE_LANG}.ts" -qm "bibletime_ui_${MESSAGE_LOCALE_LANG}.qm" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/") + ADD_DEPENDENCIES("compile_messages_${MESSAGE_LOCALE_LANG}" "messages_${MESSAGE_LOCALE_LANG}") + ADD_DEPENDENCIES("messages" "compile_messages_${MESSAGE_LOCALE_LANG}") +ENDFOREACH(MESSAGE_LOCALE_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") +ADD_DEPENDENCIES(messages "messages_default") +###################################################### + +IF(CMAKE_SYSTEM MATCHES "BSD") + SET(BT_DOCBOOK_XSL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs_freebsd.xsl") +ELSE(CMAKE_SYSTEM MATCHES "BSD") + SET(BT_DOCBOOK_XSL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs.xsl") +ENDIF(CMAKE_SYSTEM MATCHES "BSD") + +###################################################### +# Update handbook +ADD_CUSTOM_TARGET("handbook") + +ADD_CUSTOM_TARGET("handbook_translations" + COMMAND po4a -v --no-backups -k 0 cmake/docs/handbook_po4a.conf + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en") + ADD_CUSTOM_TARGET("handbook_${HANDBOOK_LOCALE_LANG}" + COMMAND xsltproc --stringparam l10n.gentext.default.language ${HANDBOOK_LOCALE_LANG} ${BT_DOCBOOK_XSL} ../docbook/index.docbook + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/${HANDBOOK_LOCALE_LANG}/html/") + ADD_DEPENDENCIES("handbook_${HANDBOOK_LOCALE_LANG}" "handbook_translations") + ADD_DEPENDENCIES("handbook" "handbook_${HANDBOOK_LOCALE_LANG}") +ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS}) +###################################################### + +###################################################### +# Update howto +ADD_CUSTOM_TARGET("howto") +ADD_CUSTOM_TARGET("howto_translations" + COMMAND po4a -v --no-backups -k 0 cmake/docs/howto_po4a.conf + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +ADD_DEPENDENCIES("howto" "howto_translations") + + +FOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en") + ADD_CUSTOM_TARGET("howto_${HOWTO_LOCALE_LANG}" + COMMAND xsltproc --stringparam l10n.gentext.default.language ${HOWTO_LOCALE_LANG} ${BT_DOCBOOK_XSL} "../docbook/index.docbook" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/howto/${HOWTO_LOCALE_LANG}/html/") + ADD_DEPENDENCIES("howto_${HOWTO_LOCALE_LANG}" "howto_translations") + ADD_DEPENDENCIES("howto" "howto_${HOWTO_LOCALE_LANG}") +ENDFOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS}) + +###################################################### \ No newline at end of file diff --git a/cmake/bibletime_source_list.cmake b/cmake/BTSourceFileList.cmake similarity index 93% rename from cmake/bibletime_source_list.cmake rename to cmake/BTSourceFileList.cmake index 20e7135..45ad65c 100644 --- a/cmake/bibletime_source_list.cmake +++ b/cmake/BTSourceFileList.cmake @@ -8,7 +8,9 @@ SET(bibletime_SOURCES #backend bookshelf model: src/backend/bookshelfmodel/btbookshelfmodel.cpp src/backend/bookshelfmodel/btbookshelftreemodel.cpp - src/backend/bookshelfmodel/btcheckstatefilterproxymodel.cpp +# src/backend/bookshelfmodel/btcheckstatefilterproxymodel.cpp +# src/backend/bookshelfmodel/btmodulecategoryfilterproxymodel.cpp + src/backend/bookshelfmodel/btmodulehiddenfilterproxymodel.cpp src/backend/bookshelfmodel/btmodulenamefilterproxymodel.cpp src/backend/bookshelfmodel/categoryitem.cpp src/backend/bookshelfmodel/distributionitem.cpp @@ -18,6 +20,7 @@ SET(bibletime_SOURCES #backend filters src/backend/filters/bt_gbfhtml.cpp src/backend/filters/bt_osishtml.cpp + src/backend/filters/bt_teihtml.cpp src/backend/filters/bt_plainhtml.cpp src/backend/filters/bt_thmlhtml.cpp src/backend/filters/bt_thmlplain.cpp @@ -34,7 +37,7 @@ SET(bibletime_SOURCES src/backend/managers/btstringmgr.cpp src/backend/managers/cdisplaytemplatemgr.cpp src/backend/managers/clanguagemgr.cpp - src/backend/managers/creferencemanager.cpp + src/backend/managers/referencemanager.cpp src/backend/managers/cswordbackend.cpp #backend module drivers src/backend/drivers/cswordmoduleinfo.cpp @@ -56,11 +59,11 @@ SET(bibletime_SOURCES #utilities src/util/cresmgr.cpp src/util/cpointers.cpp - src/util/ctoolclass.cpp + src/util/tool.cpp src/util/dialogutil.cpp - src/util/directoryutil.cpp + src/util/directory.cpp src/util/migrationutil.cpp - + # frontend top level src/frontend/btbookshelfdockwidget.cpp src/frontend/cdragdrop.cpp @@ -76,23 +79,17 @@ SET(bibletime_SOURCES # Bookshelf/Bookmarks widget in main window src/frontend/mainindex/btbookshelfview.cpp - + src/frontend/mainindex/bookmarks/cbookmarkindex.cpp src/frontend/mainindex/bookmarks/btbookmarkloader.cpp src/frontend/mainindex/bookmarks/btbookmarkitembase.cpp src/frontend/mainindex/bookmarks/btbookmarkitem.cpp src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp - src/frontend/mainindex/bookshelf/cbookshelfindex.cpp - src/frontend/mainindex/bookshelf/btindexitem.cpp - src/frontend/mainindex/bookshelf/btindexmodule.cpp - src/frontend/mainindex/bookshelf/btindexfolder.cpp - src/frontend/mainindex/bookshelf/chidemodulechooserdialog.cpp - #Settings dialog (configuration) - src/frontend/settingsdialogs/btshortcutsdialog.cpp - src/frontend/settingsdialogs/btshortcutseditor.cpp - src/frontend/settingsdialogs/cacceleratorsettings.cpp + src/frontend/settingsdialogs/btshortcutsdialog.cpp + src/frontend/settingsdialogs/btshortcutseditor.cpp + src/frontend/settingsdialogs/cacceleratorsettings.cpp src/frontend/settingsdialogs/cdisplaysettings.cpp src/frontend/settingsdialogs/cswordsettings.cpp src/frontend/settingsdialogs/clanguagesettings.cpp @@ -118,15 +115,17 @@ SET(bibletime_SOURCES src/frontend/bookshelfmanager/removepage/btremovepage.cpp src/frontend/bookshelfmanager/indexpage/btindexpage.cpp - #Search dialog - src/frontend/searchdialog/csearchdialog.cpp - src/frontend/searchdialog/csearchresultview.cpp - src/frontend/searchdialog/btsearchresultarea.cpp + # Search dialog src/frontend/searchdialog/btsearchoptionsarea.cpp + src/frontend/searchdialog/btsearchresultarea.cpp src/frontend/searchdialog/chistorycombobox.cpp src/frontend/searchdialog/cmoduleresultview.cpp - src/frontend/searchdialog/csearchmodulechooserdialog.cpp src/frontend/searchdialog/crangechooserdialog.cpp + src/frontend/searchdialog/csearchdialog.cpp + src/frontend/searchdialog/csearchmodulechooserdialog.cpp + src/frontend/searchdialog/csearchresultview.cpp + + # Search analysis src/frontend/searchdialog/analysis/csearchanalysisitem.cpp src/frontend/searchdialog/analysis/csearchanalysislegenditem.cpp src/frontend/searchdialog/analysis/csearchanalysisscene.cpp @@ -153,7 +152,7 @@ SET(bibletime_SOURCES src/frontend/keychooser/versekeychooser/btversekeymenu.cpp src/frontend/keychooser/bthistory.cpp - + #behaviour for display areas src/frontend/display/bthtmlfindtext.cpp src/frontend/display/bthtmljsobject.cpp @@ -165,7 +164,7 @@ SET(bibletime_SOURCES src/frontend/display/chtmlwritedisplay.cpp src/frontend/display/btfontsizewidget.cpp src/frontend/display/btcolorwidget.cpp - + #display windows and their widgets src/frontend/displaywindow/bttoolbarpopupaction.cpp src/frontend/displaywindow/btactioncollection.cpp @@ -182,7 +181,7 @@ SET(bibletime_SOURCES src/frontend/displaywindow/ccommentaryreadwindow.cpp src/frontend/displaywindow/cbookreadwindow.cpp src/frontend/displaywindow/cdisplaywindowfactory.cpp - + # web based tab dialogs src/frontend/htmldialogs/btaboutdialog.cpp src/frontend/htmldialogs/bttabhtmldialog.cpp @@ -201,7 +200,9 @@ SET(bibletime_SOURCES SET(bibletime_MOCABLE_HEADERS src/backend/bookshelfmodel/btbookshelfmodel.h src/backend/bookshelfmodel/btbookshelftreemodel.h - src/backend/bookshelfmodel/btcheckstatefilterproxymodel.h +# src/backend/bookshelfmodel/btcheckstatefilterproxymodel.h +# src/backend/bookshelfmodel/btmodulecategoryfilterproxymodel.h + src/backend/bookshelfmodel/btmodulehiddenfilterproxymodel.h src/backend/bookshelfmodel/btmodulenamefilterproxymodel.h src/backend/drivers/cswordmoduleinfo.h src/backend/managers/cswordbackend.h @@ -220,8 +221,6 @@ SET(bibletime_MOCABLE_HEADERS src/frontend/searchdialog/csearchresultview.h src/frontend/searchdialog/chistorycombobox.h src/frontend/cdragdrop.h - src/frontend/mainindex/bookshelf/chidemodulechooserdialog.h - src/frontend/mainindex/bookshelf/cbookshelfindex.h src/frontend/mainindex/btbookshelfview.h src/frontend/mainindex/bookmarks/cbookmarkindex.h src/frontend/cmdiarea.h diff --git a/cmake/BTWinIcon.rc b/cmake/BTWinIcon.rc new file mode 100644 index 0000000..87a81e8 --- /dev/null +++ b/cmake/BTWinIcon.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "..\\pics\\icons\\bibletime.ico" \ No newline at end of file diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake deleted file mode 100644 index 721e8a4..0000000 --- a/cmake/config.h.cmake +++ /dev/null @@ -1,15 +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. -* -**********/ - -#ifndef CONFIG_H_CMAKE -#define CONFIG_H_CMAKE - -#define BT_VERSION "${BT_VERSION}" - -#endif //CONFIG_H_CMAKE diff --git a/cmake/platforms/linux/bibletime.desktop.cmake b/cmake/platforms/linux/bibletime.desktop.cmake index a668d0b..15dd6d1 100644 --- a/cmake/platforms/linux/bibletime.desktop.cmake +++ b/cmake/platforms/linux/bibletime.desktop.cmake @@ -4,7 +4,10 @@ Comment[C]=An easy to use bible study tool Comment[cs]=Snadno pouiteln n�troj pro studium Bible Comment[da]=Et letanvendeligt bibelstudieprogram Comment[de]=Ein einfach zu benutzendes Bibelprogramm -Comment[fr]=Un outil d'�ude biblique facile �utiliser +Comment[et]=Lihtne Piibliuurimise vahend +Comment[fi]=Helppokäyttöinen raamatunlukuohjelmisto +Comment[fr]=Un outil d'éde biblique facile àtiliser +Comment[it]=Un semplice strumento per studiare la Bibbia Exec=bibletime Icon=bibletime MimeType= @@ -13,11 +16,11 @@ 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 -X-KDE-SubstituteUID=false -X-KDE-Username= -Categories=X-Bible;X-Religion;Literature;Art;Education;Utility;KDE;Qt; +Categories=X-Bible;X-Religion;Literature;Education;Dictionary;Qt DocPath=bibletime/handbook/index.html diff --git a/cmake/platforms/windows/README.txt b/cmake/platforms/windows/README.txt new file mode 100644 index 0000000..4810a98 --- /dev/null +++ b/cmake/platforms/windows/README.txt @@ -0,0 +1,2 @@ + +The filemgr.cpp in this directory should be copied into the sword/src/mgr directory and overwrite the filemgr.cpp in that directory. diff --git a/cmake/platforms/windows/filemgr.cpp b/cmake/platforms/windows/filemgr.cpp new file mode 100644 index 0000000..11c2800 --- /dev/null +++ b/cmake/platforms/windows/filemgr.cpp @@ -0,0 +1,570 @@ +/****************************************************************************** + * filemgr.cpp - implementation of class FileMgr used for pooling file + * handles + * + * $Id: filemgr.cpp 2245 2009-02-10 23:22:28Z scribe $ + * + * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * 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 + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#if !defined(__GNUC__) && !defined(_WIN32_WCE) +#include +#include +#else +#include +#endif + + +#ifndef O_BINARY +#define O_BINARY 0 +#endif + +#ifndef S_IRGRP +#define S_IRGRP 0 +#endif + +#ifndef S_IROTH +#define S_IROTH 0 +#endif + +// Fix for VC6 +#ifndef S_IREAD +#ifdef _S_IREAD +#define S_IREAD _S_IREAD +#define S_IWRITE _S_IWRITE +#endif +#endif +// ----------- + + +SWORD_NAMESPACE_START + + +int FileMgr::CREAT = O_CREAT; +int FileMgr::APPEND = O_APPEND; +int FileMgr::TRUNC = O_TRUNC; +int FileMgr::RDONLY = O_RDONLY; +int FileMgr::RDWR = O_RDWR; +int FileMgr::WRONLY = O_WRONLY; +int FileMgr::IREAD = S_IREAD; +int FileMgr::IWRITE = S_IWRITE; + + +// ---------------- statics ----------------- +FileMgr *FileMgr::systemFileMgr = 0; + +class __staticsystemFileMgr { +public: + __staticsystemFileMgr() { } + ~__staticsystemFileMgr() { delete FileMgr::systemFileMgr; } +} _staticsystemFileMgr; + + +FileMgr *FileMgr::getSystemFileMgr() { + if (!systemFileMgr) + systemFileMgr = new FileMgr(); + + return systemFileMgr; +} + + +void FileMgr::setSystemFileMgr(FileMgr *newFileMgr) { + if (systemFileMgr) + delete systemFileMgr; + systemFileMgr = newFileMgr; +} + +// --------------- end statics -------------- + + +FileDesc::FileDesc(FileMgr *parent, const char *path, int mode, int perms, bool tryDowngrade) { + this->parent = parent; + this->path = 0; + stdstr(&this->path, path); + this->mode = mode; + this->perms = perms; + this->tryDowngrade = tryDowngrade; + offset = 0; + fd = -77; +} + + +FileDesc::~FileDesc() { + if (fd > 0) + close(fd); + + if (path) + delete [] path; +} + + +int FileDesc::getFd() { + if (fd == -77) + fd = parent->sysOpen(this); +// if ((fd < -1) && (fd != -77)) // kludge to hand ce +// return 777; + return fd; +} + + +long FileDesc::seek(long offset, int whence) { + return lseek(getFd(), offset, whence); +} + + +long FileDesc::read(void *buf, long count) { + int fd = getFd(); + if (fd < 0) { + return 0; + } + return ::read(fd, buf, count); +} + + +long FileDesc::write(const void *buf, long count) { + return ::write(getFd(), buf, count); +} + + +FileMgr::FileMgr(int maxFiles) { + this->maxFiles = maxFiles; // must be at least 2 + files = 0; +} + + +FileMgr::~FileMgr() { + FileDesc *tmp; + + while(files) { + tmp = files->next; + delete files; + files = tmp; + } +} + + +FileDesc *FileMgr::open(const char *path, int mode, bool tryDowngrade) { + return open(path, mode, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH, tryDowngrade); +} + + +FileDesc *FileMgr::open(const char *path, int mode, int perms, bool tryDowngrade) { + FileDesc **tmp, *tmp2; + + for (tmp = &files; *tmp; tmp = &((*tmp)->next)) { + if ((*tmp)->fd < 0) // insert as first non-system_open file + break; + } + + tmp2 = new FileDesc(this, path, mode, perms, tryDowngrade); + tmp2->next = *tmp; + *tmp = tmp2; + + return tmp2; +} + + +void FileMgr::close(FileDesc *file) { + FileDesc **loop; + + for (loop = &files; *loop; loop = &((*loop)->next)) { + if (*loop == file) { + *loop = (*loop)->next; + delete file; + break; + } + } +} + + +int FileMgr::sysOpen(FileDesc *file) { + FileDesc **loop; + int openCount = 1; // because we are presently opening 1 file, and we need to be sure to close files to accomodate, if necessary + + for (loop = &files; *loop; loop = &((*loop)->next)) { + + if ((*loop)->fd > 0) { + if (++openCount > maxFiles) { + (*loop)->offset = lseek((*loop)->fd, 0, SEEK_CUR); + ::close((*loop)->fd); + (*loop)->fd = -77; + } + } + + if (*loop == file) { + if (*loop != files) { + *loop = (*loop)->next; + file->next = files; + files = file; + } + if ((!access(file->path, 04)) || ((file->mode & O_CREAT) == O_CREAT)) { // check for at least file exists / read access before we try to open + char tries = (((file->mode & O_RDWR) == O_RDWR) && (file->tryDowngrade)) ? 2 : 1; // try read/write if possible + for (int i = 0; i < tries; i++) { + if (i > 0) { + file->mode = (file->mode & ~O_RDWR); // remove write access + file->mode = (file->mode | O_RDONLY);// add read access + } + file->fd = ::open(file->path, file->mode|O_BINARY, file->perms); + + if (file->fd >= 0) + break; + } + + if (file->fd >= 0) + lseek(file->fd, file->offset, SEEK_SET); + } + else file->fd = -1; + if (!*loop) + break; + } + } + return file->fd; +} + + +// to truncate a file at its current position +// leaving byte at current possition intact +// deleting everything afterward. +signed char FileMgr::trunc(FileDesc *file) { + + static const char *writeTest = "x"; + long size = file->seek(1, SEEK_CUR); + if (size == 1) // was empty + size = 0; + char nibble [ 32767 ]; + bool writable = file->write(writeTest, 1); + int bytes = 0; + + if (writable) { + // get tmpfilename + char *buf = new char [ strlen(file->path) + 10 ]; + int i; + for (i = 0; i < 9999; i++) { + sprintf(buf, "%stmp%.4d", file->path, i); + if (!existsFile(buf)) + break; + } + if (i == 9999) + return -2; + + int fd = ::open(buf, O_CREAT|O_RDWR, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH); + if (fd < 0) + return -3; + + file->seek(0, SEEK_SET); + while (size > 0) { + bytes = file->read(nibble, 32767); + write(fd, nibble, (bytes < size)?bytes:size); + size -= bytes; + } + // zero out the file + ::close(file->fd); + file->fd = ::open(file->path, O_TRUNC, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH); + ::close(file->fd); + file->fd = -77; // force file open by filemgr + // copy tmp file back (dumb, but must preserve file permissions) + lseek(fd, 0, SEEK_SET); + do { + bytes = read(fd, nibble, 32767); + file->write(nibble, bytes); + } while (bytes == 32767); + + ::close(fd); + ::close(file->fd); + removeFile(buf); // remove our tmp file + file->fd = -77; // causes file to be swapped out forcing open on next call to getFd() + } + else { // put offset back and return failure + file->seek(-1, SEEK_CUR); + return -1; + } + return 0; +} + + +signed char FileMgr::existsFile(const char *ipath, const char *ifileName) +{ + int len = strlen(ipath) + ((ifileName)?strlen(ifileName):0) + 3; + char *ch; + char *path = new char [ len ]; + strcpy(path, ipath); + + if ((path[strlen(path)-1] == '\\') || (path[strlen(path)-1] == '/')) + path[strlen(path)-1] = 0; + + if (ifileName) { + ch = path + strlen(path); + sprintf(ch, "/%s", ifileName); + } + signed char retVal = !access(path, 04); + delete [] path; + return retVal; +} + + +signed char FileMgr::existsDir(const char *ipath, const char *idirName) +{ + char *ch; + int len = strlen(ipath) + ((idirName)?strlen(idirName):0) + 1; + if (idirName) + len += strlen(idirName); + char *path = new char [ len ]; + strcpy(path, ipath); + + if ((path[strlen(path)-1] == '\\') || (path[strlen(path)-1] == '/')) + path[strlen(path)-1] = 0; + + if (idirName) { + ch = path + strlen(path); + sprintf(ch, "/%s", idirName); + } + signed char retVal = !access(path, 04); + delete [] path; + return retVal; +} + + +int FileMgr::createParent(const char *pName) { + char *buf = new char [ strlen(pName) + 1 ]; + int retCode = 0; + + strcpy(buf, pName); + int end = strlen(buf) - 1; + while (end) { + if ((buf[end] == '/') || (buf[end] == '\\')) + break; + end--; + } + buf[end] = 0; + if (strlen(buf)>0) { + if (access(buf, 02)) { // not exists with write access? + if ((retCode = mkdir(buf +#ifndef WIN32 + , 0755 +#endif + ))) { + createParent(buf); + retCode = mkdir(buf +#ifndef WIN32 + , 0755 +#endif + ); + } + } + } + else retCode = -1; + delete [] buf; + return retCode; +} + + +int FileMgr::openFileReadOnly(const char *fName) { + int fd = ::open(fName, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH); + return fd; +} + + +int FileMgr::createPathAndFile(const char *fName) { + int fd; + + fd = ::open(fName, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH); + if (fd < 1) { + createParent(fName); + fd = ::open(fName, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH); + } + return fd; +} + + +int FileMgr::copyFile(const char *sourceFile, const char *targetFile) { + int sfd, dfd, len; + char buf[4096]; + + if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1) + return -1; + if ((dfd = createPathAndFile(targetFile)) < 1) + return -1; + + do { + len = read(sfd, buf, 4096); + write(dfd, buf, len); + } + while(len == 4096); + ::close(dfd); + ::close(sfd); + + return 0; +} + + +int FileMgr::removeFile(const char *fName) { + return ::remove(fName); +} + +char FileMgr::getLine(FileDesc *fDesc, SWBuf &line) { + int len; + bool more = true; + char chunk[255]; + + line = ""; + + // assert we have a valid file handle + if (fDesc->getFd() < 1) + return 0; + + while (more) { + more = false; + long index = fDesc->seek(0, SEEK_CUR); + len = fDesc->read(chunk, 254); + + // assert we have a readable file (not a directory) + if (len < 1) + break; + + int start = 0; + // clean up any preceding white space if we're at the beginning of line + if (!line.length()) { + for (;start < len; start++) { + if ((chunk[start] != 13) && (chunk[start] != ' ') && (chunk[start] != '\t')) + break; + } + } + + // find the end + int end; + for (end = start; ((end < (len-1)) && (chunk[end] != 10)); end++); + + if ((chunk[end] != 10) && (len == 254)) { + more = true; + } + index += (end + 1); + + // reposition to next valid place to read + fDesc->seek(index, SEEK_SET); + + // clean up any trailing junk on line if we're at the end + if (!more) { + for (; end > start; end--) { + if ((chunk[end] != 10) && (chunk[end] != 13) && (chunk[end] != ' ') && (chunk[end] != '\t')) { + if (chunk[end] == '\\') { + more = true; + end--; + } + break; + } + } + } + + int size = (end - start) + 1; + + if (size > 0) { + // line.appendFormatted("%.*s", size, chunk+start); + line.append(chunk+start, size); + } + } + return ((len > 0) || line.length()); +} + + +char FileMgr::isDirectory(const char *path) { + struct stat stats; + if (stat(path, &stats)) + return 0; + return ((stats.st_mode & S_IFDIR) == S_IFDIR); +} + + +int FileMgr::copyDir(const char *srcDir, const char *destDir) { + DIR *dir; + struct dirent *ent; + if ((dir = opendir(srcDir))) { + rewinddir(dir); + while ((ent = readdir(dir))) { + if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) { + SWBuf srcPath = (SWBuf)srcDir + (SWBuf)"/" + ent->d_name; + SWBuf destPath = (SWBuf)destDir + (SWBuf)"/" + ent->d_name; + if (!isDirectory(srcPath.c_str())) { + copyFile(srcPath.c_str(), destPath.c_str()); + } + else { + copyDir(srcPath.c_str(), destPath.c_str()); + } + } + } + closedir(dir); + } + return 0; +} + + +int FileMgr::removeDir(const char *targetDir) { + DIR *dir = opendir(targetDir); + struct dirent *ent; + if (dir) { + rewinddir(dir); + while ((ent = readdir(dir))) { + if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) { + SWBuf targetPath = (SWBuf)targetDir + (SWBuf)"/" + ent->d_name; + if (!isDirectory(targetPath.c_str())) { + FileMgr::removeFile(targetPath.c_str()); + } + else { + removeDir(targetPath.c_str()); + } + } + } + closedir(dir); + removeFile(targetDir); + } + return 0; +} + + +void FileMgr::flush() { + FileDesc **loop; + + for (loop = &files; *loop; loop = &((*loop)->next)) { + if ((*loop)->fd > 0) { + (*loop)->offset = lseek((*loop)->fd, 0, SEEK_CUR); + ::close((*loop)->fd); + (*loop)->fd = -77; + } + } +} + +long FileMgr::resourceConsumption() { + long count = 0; + FileDesc **loop; + for (loop = &files; *loop; loop = &((*loop)->next)) { + if ((*loop)->fd > 0) { + count++; + } + } + return count; +} + + +SWORD_NAMESPACE_END diff --git a/docs/handbook/cs/docbook/hdbk-config.docbook b/docs/handbook/cs/docbook/hdbk-config.docbook index 1a98b24..c856748 100644 --- a/docs/handbook/cs/docbook/hdbk-config.docbook +++ b/docs/handbook/cs/docbook/hdbk-config.docbook @@ -8,6 +8,7 @@ směrech, v závislosti na vašich potřebách. K dialogu nastavení můžete přistoupit výběrem Nastavení Natavit &bibletime;. + <guimenu>Display</guimenu> @@ -22,6 +23,21 @@ přistoupit výběrem <menuchoice> <guimenu>Nastavení</guimenu> </menuchoice> atd.). Přímo dostupných je více šablon. Když jednu z nich zvolíte, objeví se náhled v pravém poli.</para> </sect2> + + <sect2 id="hdbk-config-bt-desk"> + <title> + <guimenu>Desk</guimenu> + + Many features provided by the &sword; backend can now be customized in +&bibletime;. These features are documented right in the dialog. You also +have the possibility to specify standard works that should be used when no +specific work is specified in a reference. An example: The standard Bible +is used to display the content of cross references in the Bible. When you +hover over them, the Mag will show the content of the verses referred to, +according to the standard Bible you specified. With the use of text +filters, you can control the appearance of the text. + + <guimenu>Languages</guimenu> @@ -120,7 +136,8 @@ pro různé jazyky.</para> <ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS"> Crosswire's font directory</ulink> </entry> - <entry>Různá písma přístupná z ftp Crosswire Bible Society.</entry> + + <entry>Several fonts available from the &cbs; FTP site.</entry> </row> <row> <entry> @@ -151,27 +168,25 @@ url="http://www.alanwood.net/unicode/fontsbyrange.html"> výběr znaků Unicode a písma Unicode, která je podporují</ulink>).</para> </sect3> </sect2> - <sect2 id="hdbk-config-bt-desk"> - <title> - <guimenu>Desk</guimenu> - - Mnoho vlastností poskytovaných backendem Sword můžete nyní v &bibletime; -nastavit. Tyto vlastnosti jsou zdokumentovány v dialogu vpravo. Máte možnost -vybrat výchozí díla, která mají být použita, když není žádné dílo vybráno -odkazem. Například: výchozí Bible je použita k zobrazení obsahu "křížových" -biblických odkazů. Když najedete nad odkaz, časopis zobrazí náhled obsahu -veršů odkazujících na toto místo, ve výchozí Bibli kterou jste zvolili. - - + + - <guimenu>HotKeys</guimenu> + <guimenu>Shortcuts</guimenu> - Horké klávesy jsou speciální klávesové příkazy, které můžete použít namísto -položek v menu, nebo ikon. Mnoho příkazů v &bibletime; má definovány horké -klávesy (kompletní seznam naleznete v této sekci). Většině příkazů -&bibletime; zde může přiřadit horké klávesy. To je velmi užitečné pro rychlý -přístup k funkcím, které nejvíce potřebujete. + + Shortcuts (previously known as HotKeys) are special key commands that can be +used in the place of the menu items and icons. A number of &bibletime;'s +commands have predefined Shortcuts (see this section for a complete +listing). Most of &bibletime;'s commands can be assigned Shortcuts. This is +very helpful to quickly access the functions that you need the most. + + + + + + In the preceding example, F2, Bible Study Howto has a secondary shortcut +defined, CTRL+2. diff --git a/docs/handbook/cs/docbook/hdbk-intro.docbook b/docs/handbook/cs/docbook/hdbk-intro.docbook index 77602c7..f8732d8 100644 --- a/docs/handbook/cs/docbook/hdbk-intro.docbook +++ b/docs/handbook/cs/docbook/hdbk-intro.docbook @@ -2,33 +2,34 @@ Úvod O &bibletime; - &bibletime; je nástroj pro studium Bible s podporou pro různé texty a -jazyky. Také velké množství modulů děl, které je snadné nainstalovat a -spravovat. Je založen na knihovně Sword, která poskytuje -funkcionalitu pro &bibletime;, jako zobrazování biblických textů, -vyhledávání atd. Sword je vlajkovou lodí společnosti Crosswire Bible Society. - &bibletime; je navržen k použití s díly v jednom z formátů podporovaných -projektem Sword. Kompletní informace o podporovaných formátech dokumentů -naleznete ve -vývojářské sekci na stránkách projektu Sword, Crosswire Bible -Society. + &bibletime; is a Bible study tool with support for different types of texts +and languages. Even large amounts of works modules are easy to install and +manage. It is built on the &sword; library, which provides +the back-end functionality for &bibletime;, such as viewing Bible text, +searching etc. &sword; is the flagship product of the &cbs;. + + &bibletime; is designed to be used with works encoded in one of the formats +supported by the &sword; project. Complete information on the supported +document formats can be found in the developers +section of the &sword; Project, &cbs;. Dostupná díla - Přes 200 dokumentů v 50 jazycích jsou dostupné ze stránek Crosswire Bible Society. To zahrnuje: + Over 200 documents in 50 languages are available from the &cbs;. These include: Bible - Úplný text Bible, s volitelnými věcmi jako Strongova čísla, nadpisy, nebo -poznámky v textu. Bible jsou dostupné v mnoha jazycích, nejen v moderních -verzích, ale také ve starověkých jako Codex Leningradensis ( Kodex -Leningradský; "WLC", Hebrejsky), nebo Septuaginta ("LXX", Řecky). Toto je -nejmodernější sekce knihovny projektu Sword. + The full Bible text, with optional things like Strong's Numbers, headings +and/or footnotes in the text. Bibles are available in many languages, and +include not only modern versions, but also ancient texts like the Codex +Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is +the most advanced section in the library of the &sword; project. diff --git a/docs/handbook/cs/docbook/hdbk-operation.docbook b/docs/handbook/cs/docbook/hdbk-operation.docbook index bbd762c..2859a4f 100644 --- a/docs/handbook/cs/docbook/hdbk-operation.docbook +++ b/docs/handbook/cs/docbook/hdbk-operation.docbook @@ -51,15 +51,15 @@ existující okno, které se přesune na požadované umístění. Další informace o dílech - Pokud kliknete pravým tlačítkem myši na symbol -díla, objeví se nabídka s dalšími možnostmi, které jsou relevantní pro toto -dílo. "O tomto díle"otevře okno s mnoha -zajímavými informacemi o zvoleném díle. "Odemknout toto -dílo" otevře malý dialog pro zašifrované dokumenty, kde můžete -vložit přístupový kód k otevření díla. Pro další informace o zamčených -dílech se podívejte na tuto -stránku na webu Crosswire Bible Society. + If you click with the right mouse button on the +symbol of a work, you will see a menu with additional entries that are +relevant for this work. "About this work" opens +a window with lots of interesting information about the selected work. +"Unlock this work" opens a small dialog for +encrypted documents, where you can enter the unlock key to access the +work. For additional information on locked works, please see this +page on the &cbs; web site. @@ -138,9 +138,11 @@ funguje to. Úpravy vašich vlastních komentářů - Aby jste mohli ukládat vlastní komentáře částí Bible, musíte nainstalovat -dílo z knihovny Crosswire Bible -Society, které se jmenuje "Personal commentary" ("Osobní komentář"). + + To be able to store your own comments about parts of the Bible, you have +install a certain work from the library of the &cbs;. This work is called "Personal +commentary". Pokud otevřete osobní komentář kliknutím levým tlačítkem myši na jeho symbol v knihovně, otevře se v módu pro čtení. V @@ -168,13 +170,13 @@ text. Vyhledávání textu v aktivním okně - Když chcete hledat slovo nebo frázi v otevřeném aktivním okně -(např. kapitolu bible, kterou čtete), je to stejné jako v jiných -programech. Tuto funkci můžete vyvolat kliknutím -pravým tlačítkem myši a zvolením -Najít..., nebo použitím horké klávesy &Ctrl;F. Přečtěte si jak hledat -v celých dílech. + You can look for a word or phrase in the open read window (e.g. the chapter +of a bible that you're reading) just like you are used to from other +programs. This function can be reached either by clicking with the +right mouse button and selecting +Find..., or by using the shortcut &Ctrl;F. Read on to learn how +you can search in entire works. @@ -218,55 +220,74 @@ definovaných oblastí v seznamu Rozsah hledání Můžete definovat vlastní vyhledávací rozsahy kliknutím na tlačítko Nastavit rozsah.> + Úvod do jednoduché vyhledávací syntaxe - Vložte výrazy a oddělte je mezerami. Při výchozím nastavení, vyhledávání -vrátí výsledky, které odpovídají libovolnému z vyhledávaných výrazů (logická -spojka NEBO). pro vyhledání všech výrazů oddělte jednotlivá slova spojkou -AND. - Můžete využít znaky: '*' odpovídající libovolné posloupnosti znaků, '?' -zastupující libovolný jeden znak. Použití závorek vám dovoluje seskupovat -hledané výrazy, např. '(Ježíš OR duch) AND Bůh' --výsledky hledání budou -obsahovat nejméně jedno ze slov v závorce, Ježíš nebo duch, a slovo Bůh. - Pro vyhledávání jiného než hlavního textu vložte určitou předponu -následovanou'dvojtečkou ':' a hledaným výrazem. Například pro vyhledávání -Strongova čísla H8077 použijte 'strong:H8077' + + Enter the search phrase separated by spaces. By default the search function +will return results that match all the words. If you want to find any of +the words entered, select the Some words button. If you +want to perform a more complex search, select the Free +button. You can see examples of searches by clicking on full +syntax. + + + You can use wildcards: '*' matches any number of characters, while '?' will +match any single character. The use of brackets allows you to group your +search terms, e.g. '(Jesus OR spirit) AND God'. + + To search text other than the main text, enter the text type followed by +':', and then the search term. Refer to the table below for examples. + Dostupné předpony: Typy vyhledávání - + Předpona Význam + Example heading: hledá hlavičky + heading:Jesus footnote: hledá poznámky + footnote:Moses strong: hledání Strongových čísel + strong:G535 morph: hledá morfologické kódy + morph:N-GSM
- &bibletime; používá pro hledání vyhledávací engine Lucene, který má mnoho -pokročilých vlastností. Více si o něm můžete přečíst zde: + You can right click on an installed work and select About +to find which of the above search criteria may work for you. Not all works +have the built in features for performing this type of search. + + + &bibletime; uses the Lucene search engine to perform your searches. It has +many advanced features, and you can read more about it here: -http://lucene.apache.org/java/docs/index.html +http://lucene.apache.org/java/docs/index.html.
+ Výsledky hledání Zde vidíte kolik případů hledaného řetězce bylo nalezeno, setříděno podle @@ -322,12 +343,12 @@ vloženo v mechanice. Instalace/aktualizace děl - Tímto nástrojem se můžete připojit k repositáři děl (je zvaný "knihovna", -"library") a nahrát jedno nebo více děl do své lokální knihovny. Tyto -knihovny mohou být lokální (např. Sword CD) nebo vzdálené -(např. Crosswireonline repositář modulů Sword nebo jiné stránky nabízející -moduly Sword). Své knihovny můžete spravovat pomocí Přidat -knihovnu a Smazat knihovnu. + With this facility, you can connect to a repository of works (called +"library"), and transfer one or more works to your local Bookshelf. These +libraries may be local (e.g. a &sword; CD), or remote (e.g. Crosswire's +online repository of &sword; modules, or another site offering &sword; +modules). You can manage your libraries with Add +library and Delete library. Pro zahájení procesu instalace nebo aktualizace vyberte knihovnu ke které se chcete připojit a umístění lokální knihovny pro instalaci děl. Potom klikněte na tlačítko Spojit s knihovnou. &bibletime; diff --git a/docs/handbook/cs/docbook/hdbk-reference.docbook b/docs/handbook/cs/docbook/hdbk-reference.docbook index 44c20e9..cebeeec 100644 --- a/docs/handbook/cs/docbook/hdbk-reference.docbook +++ b/docs/handbook/cs/docbook/hdbk-reference.docbook @@ -2,12 +2,12 @@ Odkazy Odkazy Hlavního menu - V této sekci najdete detailní popis všech položek základního menu -&bibletime;. Jsou roztříděné stejně, jak se objevují v &bibletime;, včetně -podřízených položek zaznamenaných pod hlavní položkou menu ke které -náleží. Horké klávesy můžete vidět u každé položky; kompletní seznam všech -horkých kláves naleznete v této -sekci. + In this section you can find detailed descriptions of all entries in the +main menu of &bibletime;. They are ordered in just the way they appear in +&bibletime;, with all the sub-items listed under the major menu item they +belong to. You can also see the shortcut of each item;a complete listing of +all shortcuts can be found in this +section. <guimenu>File</guimenu> @@ -421,9 +421,9 @@ nastavit všechny vlastnosti &bibletime;, které potřebujete. Prosím navštivt </term> <listitem> <para> - <action>Otevře dialog kde můžete změnit vaše nastavení Sword a spravovat -svou knihovnu</action>. Další inormace naleznete v <link -linkend="hdbk-op-bookshelfmanager">této sekci</link>.</para> + <action>Opens a dialog where you can change your &sword; configuration and +manage your bookshelf</action>. Please see <link +linkend="hdbk-op-bookshelfmanager">this section</link> for details.</para> </listitem> </varlistentry> </variablelist> @@ -789,21 +789,21 @@ informace o verzi &bibletime;, přispěvatelích projektu, verzi &sword;, verzi </sect2> </sect1> - <sect1 id="hdbk-reference-hotkeys"> - <title>Seznam horkých kláves - Toto je seznam všech horkých kláves a s nimi souvisejícího popisu v -příručce. Horké klávesy jsou setříděny (přibližně) abecedně. Pokud chcete -přesně vědět která z horkých kláves odpovídá té které položce menu, můžete -se podívat přímo do nabídek &bibletime; (vždy se zde zobrazují horké -klávesy), nebo si prohlédněte tuto -sekci. + + Shortcuts index + This is index of all shortcuts and their corresponding description in the +handbook. The shortcuts are sorted (roughly) alphabetical. If you want to +directly find out which shortcuts a certain menu item has, you can either +look at the entry itself in &bibletime; (as it always shows the shortcut), +or you can look it up in this +section. - + - Klávesová zkratka + Shortcut Popis diff --git a/docs/handbook/cs/docbook/hdbk-start.docbook b/docs/handbook/cs/docbook/hdbk-start.docbook index d230052..33a99d4 100644 --- a/docs/handbook/cs/docbook/hdbk-start.docbook +++ b/docs/handbook/cs/docbook/hdbk-start.docbook @@ -1,7 +1,9 @@ Spuštění &bibletime; + Jak spustit &bibletime; + Spuštění &bibletime; &bibletime; je spustitelný soubor integrovaný do pracovního @@ -14,24 +16,23 @@ prostředí. &bibletime; můžete spustit z menu Start touto ikonou: &bibletime; spouštěcí ikona + &bibletime; může být spuštěn také z příkazové řádky. Pro spuštění &bibletime; otevřete okno terminálu a napište: - &bibletime; - - - Další správci oken - &bibletime; může být používán také s dalšími okenními správci jako Gnome, -BlackBox, Fluxbox, OpenBox nebo Sawfish, pokud jsou požadované knihovny -nainstalovány na vašem počítači. + bibletime + Nastavení spuštění Z terminálu můžete použít &bibletime; k otevření příslušného verše ve -výchozí bibli: - bibletime --open-default-biblePro otevření v dané pasáži, jako například Jan 3:16, použijte: - bibletime --open-default-bible "Jan 3:16"Můžete použít jména knih ve svém aktuálním jazyce pro pojmenování knih. +výchozí bibli: + bibletime --open-default-bible "<random>" + Pro otevření v dané pasáži, jako například Jan 3:16, použijte: + bibletime --open-default-bible "Jan 3:16" + Můžete použít jména knih ve svém aktuálním jazyce pro pojmenování knih.
+ SpouÅ¡těcí sekvence. Když se &bibletime; spouÅ¡tí, můžete vidět následující obrazovky předtím, než diff --git a/docs/handbook/cs/docbook/index.docbook b/docs/handbook/cs/docbook/index.docbook index cfe7f31..b487295 100644 --- a/docs/handbook/cs/docbook/index.docbook +++ b/docs/handbook/cs/docbook/index.docbook @@ -4,6 +4,7 @@ [ BibleTime'> Sword'> + Crosswire Bible Society'> KDE'> Qt'> @@ -47,13 +48,13 @@ Příručka &bibletime; je součástí &bibletime;. - 2009-09 - 2.3 + 2009-10 + 2.4 - &bibletime; je nástroj pro studium Bible založený na frameworku Sword. + &bibletime; is a Bible study tool based on the &sword; framework. - QT4 + Qt4 bibletime sword crosswire diff --git a/docs/handbook/cs/html/hdbk-config.html b/docs/handbook/cs/html/hdbk-config.html index 560ad38..164237c 100644 --- a/docs/handbook/cs/html/hdbk-config.html +++ b/docs/handbook/cs/html/hdbk-config.html @@ -1,11 +1,11 @@ -Kapitola 4. Nastavení BibleTime

Kapitola 4. Nastavení BibleTime

Obsah

Dialog Nastavení BibleTime
+Kapitola 4. Nastavení BibleTime

Kapitola 4. Nastavení BibleTime

V této sekci najdete úvod k nastavení BibleTime které najdete pod volbou Nastavení v hlavním menu.

Dialog Nastavení BibleTime

Uživatelské rozhraní programu BibleTime může být uzpůsobeno v mnoha směrech, v závislosti na vašich potřebách. K dialogu nastavení můžete @@ -15,7 +15,16 @@ přistoupit v

Můžete uzpůsobit chování po spuštění. Vyberte z následujících možností:

  • Zobrazovat uvítací obrazovku

Šablony zobrazení určují způsob zobrazení textu (barvu, velikost atd.). Přímo dostupných je více šablon. Když jednu z nich zvolíte, objeví se -náhled v pravém poli.

+náhled v pravém poli.

+ Desk +

Many features provided by the Sword backend can now be customized in +BibleTime. These features are documented right in the dialog. You also +have the possibility to specify standard works that should be used when no +specific work is specified in a reference. An example: The standard Bible +is used to display the content of cross references in the Bible. When you +hover over them, the Mag will show the content of the verses referred to, +according to the standard Bible you specified. With the use of text +filters, you can control the appearance of the text.

Languages

Zde můžete zvolit jazyk, který bude použit pro jména biblických knih. Pokud je dostupný, nastavte tuto možnost na váš jazyk, a budete se cítit doma.

V základním nastavení používá BibleTime výchozí systémové písmo. Pokud je @@ -46,7 +55,7 @@ pro různ Nová svobodná iniciativa písma Unicode. Crosswire's font directory - Různá písma přístupná z ftp Crosswire Bible Society. + Several fonts available from the Crosswire Bible Society FTP site. Bitstream CyberBit Pokrývají většinou celý výběr Unicode, ale mohou spomalit BibleTime v @@ -56,17 +65,11 @@ z Částečně odpovídající, pro informace se podívejte na odkazovanou stránku.


Dobré seznamy písem Unicode na internetu, jako jedno od Christopha Singera( Vícejazyčná Unicode TrueType Fonts na internetu), nebo jedno od Alana Wooda ( výběr znaků Unicode -a písma Unicode, která je podporují).

- Desk -

Mnoho vlastností poskytovaných backendem Sword můžete nyní v BibleTime -nastavit. Tyto vlastnosti jsou zdokumentovány v dialogu vpravo. Máte možnost -vybrat výchozí díla, která mají být použita, když není žádné dílo vybráno -odkazem. Například: výchozí Bible je použita k zobrazení obsahu "křížových" -biblických odkazů. Když najedete nad odkaz, časopis zobrazí náhled obsahu -veršů odkazujících na toto místo, ve výchozí Bibli kterou jste zvolili.

- HotKeys -

Horké klávesy jsou speciální klávesové příkazy, které můžete použít namísto -položek v menu, nebo ikon. Mnoho příkazů v BibleTime má definovány horké -klávesy (kompletní seznam naleznete v této sekci). Většině příkazů -BibleTime zde může přiřadit horké klávesy. To je velmi užitečné pro rychlý -přístup k funkcím, které nejvíce potřebujete.

+a písma Unicode, která je podporují).

+ Shortcuts +

Shortcuts (previously known as HotKeys) are special key commands that can be +used in the place of the menu items and icons. A number of BibleTime's +commands have predefined Shortcuts (see this section for a complete +listing). Most of BibleTime's commands can be assigned Shortcuts. This is +very helpful to quickly access the functions that you need the most.

In the preceding example, F2, Bible Study Howto has a secondary shortcut +defined, CTRL+2.

diff --git a/docs/handbook/cs/html/hdbk-intro.html b/docs/handbook/cs/html/hdbk-intro.html index 29df043..ec8da93 100644 --- a/docs/handbook/cs/html/hdbk-intro.html +++ b/docs/handbook/cs/html/hdbk-intro.html @@ -1,17 +1,16 @@ -Kapitola 1. Úvod

Kapitola 1. Úvod

O BibleTime

BibleTime je nástroj pro studium Bible s podporou pro různé texty a -jazyky. Také velké množství modulů děl, které je snadné nainstalovat a -spravovat. Je založen na knihovně Sword, která poskytuje -funkcionalitu pro BibleTime, jako zobrazování biblických textů, -vyhledávání atd. Sword je vlajkovou lodí společnosti Crosswire Bible Society.

BibleTime je navržen k použití s díly v jednom z formátů podporovaných -projektem Sword. Kompletní informace o podporovaných formátech dokumentů -naleznete ve -vývojářské sekci na stránkách projektu Sword, Crosswire Bible -Society.

Dostupná díla

Přes 200 dokumentů v 50 jazycích jsou dostupné ze stránek Crosswire Bible Society. To zahrnuje: -

Bible

Úplný text Bible, s volitelnými věcmi jako Strongova čísla, nadpisy, nebo -poznámky v textu. Bible jsou dostupné v mnoha jazycích, nejen v moderních -verzích, ale také ve starověkých jako Codex Leningradensis ( Kodex -Leningradský; "WLC", Hebrejsky), nebo Septuaginta ("LXX", Řecky). Toto je -nejmodernější sekce knihovny projektu Sword.

Knihy

Dostupné knihy jsou "Imitation of Christ", "Enuma Elish", a"Josephus: The +Kapitola 1. Úvod

Kapitola 1. Úvod

O BibleTime

BibleTime is a Bible study tool with support for different types of texts +and languages. Even large amounts of works modules are easy to install and +manage. It is built on the Sword library, which provides +the back-end functionality for BibleTime, such as viewing Bible text, +searching etc. Sword is the flagship product of the Crosswire Bible Society.

BibleTime is designed to be used with works encoded in one of the formats +supported by the Sword project. Complete information on the supported +document formats can be found in the developers +section of the Sword Project, Crosswire Bible Society.

Dostupná díla

Over 200 documents in 50 languages are available from the Crosswire Bible Society. These include: +

Bible

The full Bible text, with optional things like Strong's Numbers, headings +and/or footnotes in the text. Bibles are available in many languages, and +include not only modern versions, but also ancient texts like the Codex +Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is +the most advanced section in the library of the Sword project.

Knihy

Dostupné knihy jsou "Imitation of Christ", "Enuma Elish", a"Josephus: The Complete Works"

Komentáře

Dostupné komentáře zahrnují klasiku jako "Notes on the Bible" Johna Wesleyho, komentáře Matthewa Henryho a Lutherův "Komentář ke galatským." Pomocí Osobníhokomentáře můžete nahrát osobní sešit poznámek do diff --git a/docs/handbook/cs/html/hdbk-op-bookshelfmanager.html b/docs/handbook/cs/html/hdbk-op-bookshelfmanager.html index 613afe4..560d80a 100644 --- a/docs/handbook/cs/html/hdbk-op-bookshelfmanager.html +++ b/docs/handbook/cs/html/hdbk-op-bookshelfmanager.html @@ -1,15 +1,15 @@ -Správa knih

Správa knih

Správa knih je nástroj pro správu +Správa knih

Správa knih

Správa knih je nástroj pro správu knihovny. Můžete do vaší knihovny nainstalovat nová díla, nebo aktualizovat či odstranit ty existující. Přístupná pod NastaveníSpráva knih v hlavním menu.

Nastavení cesty ke knihám

Zde lze nastavit, kam na disk má BibleTime uložit knihovnu. Můžete použít mnoho adresářů. Výchozí je "~/.sword/".

Tip

Pokud máte CD sword, ale nechcete všechna díla instalovat na disk, ale používat je přímo z CD, pak vložte cestu k CD jako jedno z umístění knihovny. Když zapnete BibleTime, zobrazí se všechna díla, pokud je CD -vloženo v mechanice.

Instalace/aktualizace děl

Tímto nástrojem se můžete připojit k repositáři děl (je zvaný "knihovna", -"library") a nahrát jedno nebo více děl do své lokální knihovny. Tyto -knihovny mohou být lokální (např. Sword CD) nebo vzdálené -(např. Crosswireonline repositář modulů Sword nebo jiné stránky nabízející -moduly Sword). Své knihovny můžete spravovat pomocí Přidat -knihovnu a Smazat knihovnu.

Pro zahájení procesu instalace nebo aktualizace vyberte knihovnu ke které se +vloženo v mechanice.

Instalace/aktualizace děl

With this facility, you can connect to a repository of works (called +"library"), and transfer one or more works to your local Bookshelf. These +libraries may be local (e.g. a Sword CD), or remote (e.g. Crosswire's +online repository of Sword modules, or another site offering Sword +modules). You can manage your libraries with Add +library and Delete library.

Pro zahájení procesu instalace nebo aktualizace vyberte knihovnu ke které se chcete připojit a umístění lokální knihovny pro instalaci děl. Potom klikněte na tlačítko Spojit s knihovnou. BibleTime prověří obsah knihovny a předloží vám seznam děl, které můžete do své diff --git a/docs/handbook/cs/html/hdbk-op-output.html b/docs/handbook/cs/html/hdbk-op-output.html index 902f495..0314188 100644 --- a/docs/handbook/cs/html/hdbk-op-output.html +++ b/docs/handbook/cs/html/hdbk-op-output.html @@ -1,4 +1,4 @@ -Export a tisk

Export a tisk

Na mnoha místech můžete vyvolat kontextové menu kliknutím +Export a tisk

Export a tisk

Na mnoha místech můžete vyvolat kontextové menu kliknutím pravým tlačítkem myši. V závislosti na kontextu je možné Vybrat, Kopírovat (do schránky), diff --git a/docs/handbook/cs/html/hdbk-op-parts.html b/docs/handbook/cs/html/hdbk-op-parts.html index 827173b..ad75241 100644 --- a/docs/handbook/cs/html/hdbk-op-parts.html +++ b/docs/handbook/cs/html/hdbk-op-parts.html @@ -1,4 +1,4 @@ -Části okna aplikace BibleTime

Části okna aplikace BibleTime

Knihovna

Knihovna obsahuje všechna nainstalovaná díla, setříděná podle kategorií a +Části okna aplikace BibleTime

Části okna aplikace BibleTime

Knihovna

Knihovna obsahuje všechna nainstalovaná díla, setříděná podle kategorií a jazyků. Obsahuje také kategorii "Záložky" To je místo, kam můžete uložit své záložky a poté k nim přistupovat.

Čtení děl

Pro otevření díla z knihovny jednoduše klikněte levým tlačítkem myši na požadovanou kategorii @@ -9,14 +9,14 @@ použ tlačítkem myši na odkaz verše nebo kapitoly (kurzor se změní v ruku) a přetáhněte ho do knihovny. Upusťte ho na dílo, které chcete otevřít ,a to bude otevřeno na požadovaném místě. Můžete také přetáhnout odkaz verše na -existující okno, které se přesune na požadované umístění.

Další informace o dílech

Pokud kliknete pravým tlačítkem myši na symbol -díla, objeví se nabídka s dalšími možnostmi, které jsou relevantní pro toto -dílo. "O tomto díle"otevře okno s mnoha -zajímavými informacemi o zvoleném díle. "Odemknout toto -dílo" otevře malý dialog pro zašifrované dokumenty, kde můžete -vložit přístupový kód k otevření díla. Pro další informace o zamčených -dílech se podívejte na tuto -stránku na webu Crosswire Bible Society.

Vyhledávání v dílech

Vyhledávat v díle můžete kliknutím pravým +existující okno, které se přesune na požadované umístění.

Další informace o dílech

If you click with the right mouse button on the +symbol of a work, you will see a menu with additional entries that are +relevant for this work. "About this work" opens +a window with lots of interesting information about the selected work. +"Unlock this work" opens a small dialog for +encrypted documents, where you can enter the unlock key to access the +work. For additional information on locked works, please see this +page on the Crosswire Bible Society web site.

Vyhledávání v dílech

Vyhledávat v díle můžete kliknutím pravým tlačítkem myši na jeho symbol a vybráním položky"Hledat v díle(ch)". 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 @@ -51,9 +51,9 @@ ovl docílíte volbou jednoho z automatických módů umístění, které jsou přístupné přes OknoMód rozvržení. Prostě to vyzkoušejte, je to snadné a -funguje to.

Úpravy vašich vlastních komentářů

Aby jste mohli ukládat vlastní komentáře částí Bible, musíte nainstalovat -dílo z knihovny Crosswire Bible -Society, které se jmenuje "Personal commentary" ("Osobní komentář").

Pokud otevřete osobní komentář kliknutím levým +funguje to.

Úpravy vašich vlastních komentářů

To be able to store your own comments about parts of the Bible, you have +install a certain work from the library of the Crosswire Bible Society. This work is called "Personal +commentary".

Pokud otevřete osobní komentář kliknutím levým tlačítkem myši na jeho symbol v knihovně, otevře se v módu pro čtení. V tomto módu není možné komentář editovat. Pokud si přejete do něj zapsat poznámku, musíte ho otevřít pomocí pravého diff --git a/docs/handbook/cs/html/hdbk-op-search.html b/docs/handbook/cs/html/hdbk-op-search.html index 3c21d6b..ce427f0 100644 --- a/docs/handbook/cs/html/hdbk-op-search.html +++ b/docs/handbook/cs/html/hdbk-op-search.html @@ -1,9 +1,9 @@ -Vyhledávání v dílech

Vyhledávání v dílech

Vyhledávání textu v aktivním okně

Když chcete hledat slovo nebo frázi v otevřeném aktivním okně -(např. kapitolu bible, kterou čtete), je to stejné jako v jiných -programech. Tuto funkci můžete vyvolat kliknutím -pravým tlačítkem myši a zvolením -Najít..., nebo použitím horké klávesy CtrlF. Přečtěte si jak hledat -v celých dílech.

Přístup k dialogu vyhledávání

V díle můžete hledat kliknutím pravým tlačítkem +Vyhledávání v dílech

Vyhledávání v dílech

Vyhledávání textu v aktivním okně

You can look for a word or phrase in the open read window (e.g. the chapter +of a bible that you're reading) just like you are used to from other +programs. This function can be reached either by clicking with the +right mouse button and selecting +Find..., or by using the shortcut CtrlF. Read on to learn how +you can search in entire works.

Přístup k dialogu vyhledávání

V díle můžete hledat kliknutím pravým tlačítkem myši na symbol v Knihovně a vybráním Hledat ve vybraných dílech. Přidržením Shift nebo Ctrl a kliknutím na jména dalších děl můžete vybrat více než jedno dílo. Poté @@ -16,18 +16,21 @@ na toto tlač kterých chcete vyhledávat.

Použití oblastí vyhledávání

Můžete použít rozsah hledání zvolením určitých částí Bible pomocí jedné z definovaných oblastí v seznamu Rozsah hledání Můžete definovat vlastní vyhledávací rozsahy kliknutím na tlačítko -Nastavit rozsah.>

Úvod do jednoduché vyhledávací syntaxe

Vložte výrazy a oddělte je mezerami. Při výchozím nastavení, vyhledávání -vrátí výsledky, které odpovídají libovolnému z vyhledávaných výrazů (logická -spojka NEBO). pro vyhledání všech výrazů oddělte jednotlivá slova spojkou -AND.

Můžete využít znaky: '*' odpovídající libovolné posloupnosti znaků, '?' -zastupující libovolný jeden znak. Použití závorek vám dovoluje seskupovat -hledané výrazy, např. '(Ježíš OR duch) AND Bůh' --výsledky hledání budou -obsahovat nejméně jedno ze slov v závorce, Ježíš nebo duch, a slovo Bůh.

Pro vyhledávání jiného než hlavního textu vložte určitou předponu -následovanou'dvojtečkou ':' a hledaným výrazem. Například pro vyhledávání -Strongova čísla H8077 použijte 'strong:H8077'

Dostupné předpony: -

Tabulka 3.1. Typy vyhledávání

PředponaVýznam
heading:hledá hlavičky
footnote:hledá poznámky
strong:hledání Strongových čísel
morph:hledá morfologické kódy


BibleTime používá pro hledání vyhledávací engine Lucene, který má mnoho -pokročilých vlastností. Více si o něm můžete přečíst zde: -http://lucene.apache.org/java/docs/index.html

Výsledky hledání

Zde vidíte kolik případů hledaného řetězce bylo nalezeno, setříděno podle +Nastavit rozsah.>

Úvod do jednoduché vyhledávací syntaxe

Enter the search phrase separated by spaces. By default the search function +will return results that match all the words. If you want to find any of +the words entered, select the Some words button. If you +want to perform a more complex search, select the Free +button. You can see examples of searches by clicking on full +syntax. +

You can use wildcards: '*' matches any number of characters, while '?' will +match any single character. The use of brackets allows you to group your +search terms, e.g. '(Jesus OR spirit) AND God'.

To search text other than the main text, enter the text type followed by +':', and then the search term. Refer to the table below for examples.

Dostupné předpony: +

Tabulka 3.1. Typy vyhledávání

PředponaVýznamExample
heading:hledá hlavičkyheading:Jesus
footnote:hledá poznámkyfootnote:Moses
strong:hledání Strongových číselstrong:G535
morph:hledá morfologické kódymorph:N-GSM


Tip

You can right click on an installed work and select About +to find which of the above search criteria may work for you. Not all works +have the built in features for performing this type of search.

BibleTime uses the Lucene search engine to perform your searches. It has +many advanced features, and you can read more about it here: +http://lucene.apache.org/java/docs/index.html.

Výsledky hledání

Zde vidíte kolik případů hledaného řetězce bylo nalezeno, setříděno podle děl. Kliknutí na dílo pravým tlačítkem myši vám umožní kopírovat, uložit, nebo tisknout všechny verše které byli v daném díle nalezeny. Kliknutím na jeden nebo více odkazů ke kopírování, uložení diff --git a/docs/handbook/cs/html/hdbk-op.html b/docs/handbook/cs/html/hdbk-op.html index 75f3424..a52dad1 100644 --- a/docs/handbook/cs/html/hdbk-op.html +++ b/docs/handbook/cs/html/hdbk-op.html @@ -1,4 +1,4 @@ -Kapitola 3. Operace programu

Kapitola 3. Operace programu

Náhled programu

Takto vypadá typická relace BibleTime: +Kapitola 3. Operace programu

Kapitola 3. Operace programu

Náhled programu

Takto vypadá typická relace BibleTime:

Okno aplikace BibleTime

Můžete si jednoduše prohlédnout různé části aplikace. Okno vlevo nahoře se používá k otevírání instalovaných děl v kartě knihovny, na kartě záložek diff --git a/docs/handbook/cs/html/hdbk-reference-hotkeys.html b/docs/handbook/cs/html/hdbk-reference-shortcuts.html similarity index 81% rename from docs/handbook/cs/html/hdbk-reference-hotkeys.html rename to docs/handbook/cs/html/hdbk-reference-shortcuts.html index 6d5068f..fc27ff4 100644 --- a/docs/handbook/cs/html/hdbk-reference-hotkeys.html +++ b/docs/handbook/cs/html/hdbk-reference-shortcuts.html @@ -1,9 +1,9 @@ -Seznam horkých kláves

Seznam horkých kláves

Toto je seznam všech horkých kláves a s nimi souvisejícího popisu v -příručce. Horké klávesy jsou setříděny (přibližně) abecedně. Pokud chcete -přesně vědět která z horkých kláves odpovídá té které položce menu, můžete -se podívat přímo do nabídek BibleTime (vždy se zde zobrazují horké -klávesy), nebo si prohlédněte tuto -sekci.

Klávesová zkratkaPopis
+Shortcuts index

Shortcuts index

This is index of all shortcuts and their corresponding description in the +handbook. The shortcuts are sorted (roughly) alphabetical. If you want to +directly find out which shortcuts a certain menu item has, you can either +look at the entry itself in BibleTime (as it always shows the shortcut), +or you can look it up in this +section.

@@ -994,7 +993,7 @@ Kacheln. &Ctrl;L - Change location. Changes focus to the toolbar field for the selected work. + Ort ändern. Wechselt den Fokus zur Werkzeugleiste des selektierten Werkes. @@ -1002,7 +1001,7 @@ Kacheln. &Ctrl;N - Search with works of this window. + Das Suchfenster mit den Werken dieses Fensters öffnen. diff --git a/docs/handbook/de/docbook/hdbk-start.docbook b/docs/handbook/de/docbook/hdbk-start.docbook index ab7e1f0..494b074 100644 --- a/docs/handbook/de/docbook/hdbk-start.docbook +++ b/docs/handbook/de/docbook/hdbk-start.docbook @@ -1,7 +1,9 @@ &bibletime; starten + Wie &bibletime; zu starten ist + &bibletime; starten &bibletime; ist eine ausführbare Datei, die in Ihrem Desktop integriert @@ -14,27 +16,24 @@ ist. Sie können &bibletime; aus dem Startmenü mit folgendem Symbol starten: &bibletime;-Start-Symbol + &bibletime; kann auch von der Kommandozeile eines Terminals aufgerufen werden. Um &bibletime; zu starten, öffnen Sie ein Terminal-Fenster und geben Sie folgendes ein: - &bibletime; - - - Andere Fenstermanager - &bibletime; kann mit anderen Fenstermanagern wie Gnome, BlackBox, FluxBox, -OpenBox oder Sawfish verwendet werden, vorausgesetzt, dass die -entsprechenden Basis-Bibliotheken bereits auf Ihrem Rechner installiert -sind. + bibletime + Konfiguration des Startverhaltens Von einem Terminal aus können Sie &bibletime; folgendermaßen verwenden, um -einen Zufallsvers aus der Standardbibel anzeigen zu lassen: - bibletime --open-default-bible - "<random>"Um einen bestimmten Vers wie z.B. Joh. 3,16 aufzuschlagen: - bibletime --open-default-bible "Joh 3:16"Sie können auch Buchnamen in Ihrer gegenwärtigen Buchnamen-Sprache benutzen. +einen Zufallsvers aus der Standardbibel anzeigen zu lassen: + bibletime --open-default-bible "<random>" + Um einen bestimmten Vers wie z.B. Joh. 3,16 aufzuschlagen: + bibletime --open-default-bible "Joh 3:16" + Sie können auch Buchnamen in Ihrer gegenwärtigen Buchnamen-Sprache benutzen. + Start-Sequenz Wenn &bibletime; startet, könnten Sie folgende Meldungen vor dem Erscheinen diff --git a/docs/handbook/de/docbook/index.docbook b/docs/handbook/de/docbook/index.docbook index 767ac33..4dae077 100644 --- a/docs/handbook/de/docbook/index.docbook +++ b/docs/handbook/de/docbook/index.docbook @@ -4,6 +4,7 @@ [ BibleTime'> Sword'> + Crosswire Bible Society'> KDE'> Qt'> @@ -47,13 +48,14 @@ Der &bibletime;-Hilfedialog ist ein Teil von &bibletime;. - 2009-09 - 2.3 + 2009-10 + 2.4 - &bibletime; ist ein Bibelstudien-Werkzeug, das auf dem Sword-System basiert. + &bibletime; ist ein Bibelstudien-Werkzeug, das auf dem &sword;-System +basiert. - QT4 + Qt4 bibletime sword crosswire diff --git a/docs/handbook/de/html/hdbk-config.html b/docs/handbook/de/html/hdbk-config.html index d132ab2..6a37f8b 100644 --- a/docs/handbook/de/html/hdbk-config.html +++ b/docs/handbook/de/html/hdbk-config.html @@ -1,11 +1,11 @@ -Kapitel 4. BibleTime einrichten
ShortcutPopis
AltLeft Posune zpět v historii aktivního okna.
AltRight diff --git a/docs/handbook/cs/html/hdbk-reference-toolbar.html b/docs/handbook/cs/html/hdbk-reference-toolbar.html deleted file mode 100644 index f770c9a..0000000 --- a/docs/handbook/cs/html/hdbk-reference-toolbar.html +++ /dev/null @@ -1,10 +0,0 @@ -Položky Nástrojové lišty

Položky Nástrojové lišty

Pokud chcete vysvětlit tlačítka nacházející se na nástrojové liště, -podívejte se prosím do předeslé -sekce. Můžete také přesunout kurzor nad tlačítko a počkt -několik sekund, tím se aktivuje nástrojový tip k tlačítku s jeho -krátkým popisem.

Nástrojovou lištu můžete přizpůsobit svým potřebám. Prosím použijte pro to -následující položku hlavního menu: -

- - SettingsConfigure toolbars -

Nastavit nástrojové lišty

Pro podrobné inforace navštivte tuto sekci.

diff --git a/docs/handbook/cs/html/hdbk-reference-works.html b/docs/handbook/cs/html/hdbk-reference-works.html index c3d6f2a..273d482 100644 --- a/docs/handbook/cs/html/hdbk-reference-works.html +++ b/docs/handbook/cs/html/hdbk-reference-works.html @@ -1,4 +1,4 @@ -Odkazy

Odkazy

+Odkazy

Odkazy

V této sekci najdete popis ikon přiřazených k otevřeným dílům.

@@ -84,4 +84,4 @@

Vyberte další glosář nebo modlitbu.

-

+

diff --git a/docs/handbook/cs/html/hdbk-reference.html b/docs/handbook/cs/html/hdbk-reference.html index fd0dba1..c88d16a 100644 --- a/docs/handbook/cs/html/hdbk-reference.html +++ b/docs/handbook/cs/html/hdbk-reference.html @@ -1,4 +1,4 @@ -Kapitola 5. Odkazy

Kapitola 5. Odkazy

Obsah

Odkazy Hlavního menu
+Kapitola 5. Odkazy

Kapitola 5. Odkazy

Odkazy Hlavního menu

V této sekci najdete detailní popis všech položek základního menu -BibleTime. Jsou roztříděné stejně, jak se objevují v BibleTime, včetně -podřízených položek zaznamenaných pod hlavní položkou menu ke které -náleží. Horké klávesy můžete vidět u každé položky; kompletní seznam všech -horkých kláves naleznete v této -sekci.

+

Odkazy
Shortcuts index

Odkazy Hlavního menu

In this section you can find detailed descriptions of all entries in the +main menu of BibleTime. They are ordered in just the way they appear in +BibleTime, with all the sub-items listed under the major menu item they +belong to. You can also see the shortcut of each item;a complete listing of +all shortcuts can be found in this +section.

File

@@ -119,8 +119,8 @@ nastavit všechny vlastnosti BibleTime, kte SettingsBookshelf Manager (F4)

- Otevře dialog kde můžete změnit vaše nastavení Sword a spravovat -svou knihovnu. Další inormace naleznete v této sekci.

+ Opens a dialog where you can change your Sword configuration and +manage your bookshelf. Please see this section for details.

Help

diff --git a/docs/handbook/cs/html/hdbk-startsequence.html b/docs/handbook/cs/html/hdbk-startsequence.html index d985056..2b7cbb9 100644 --- a/docs/handbook/cs/html/hdbk-startsequence.html +++ b/docs/handbook/cs/html/hdbk-startsequence.html @@ -1,4 +1,4 @@ -Spouštěcí sekvence.

Spouštěcí sekvence.

Když se BibleTime spouští, můžete vidět následující obrazovky předtím, než +Spouštěcí sekvence.

Spouštěcí sekvence.

Když se BibleTime spouští, můžete vidět následující obrazovky předtím, než se otevře hlavní okno BibleTime:

Bookshelf Manager

diff --git a/docs/handbook/cs/html/hdbk-term.html b/docs/handbook/cs/html/hdbk-term.html index a1afb5a..6bf13bd 100644 --- a/docs/handbook/cs/html/hdbk-term.html +++ b/docs/handbook/cs/html/hdbk-term.html @@ -1,10 +1,10 @@ -Kapitola 2. Spuštění BibleTime

Kapitola 2. Spuštění BibleTime

Jak spustit BibleTime

Spuštění BibleTime

BibleTime je spustitelný soubor integrovaný do pracovního +Kapitola 2. Spuštění BibleTime

Kapitola 2. Spuštění BibleTime

Jak spustit BibleTime

Spuštění BibleTime

BibleTime je spustitelný soubor integrovaný do pracovního prostředí. BibleTime můžete spustit z menu Start touto ikonou:

BibleTime spouštěcí ikona

BibleTime může být spuštěn také z příkazové řádky. Pro spuštění BibleTime otevřete okno terminálu a napište: -

BibleTime

Další správci oken

BibleTime může být používán také s dalšími okenními správci jako Gnome, -BlackBox, Fluxbox, OpenBox nebo Sawfish, pokud jsou požadované knihovny -nainstalovány na vašem počítači.

Nastavení spuštění

Z terminálu můžete použít BibleTime k otevření příslušného verše ve -výchozí bibli: -

bibletime --open-default-bible

Pro otevření v dané pasáži, jako například Jan 3:16, použijte: -

bibletime --open-default-bible "Jan 3:16"

Můžete použít jména knih ve svém aktuálním jazyce pro pojmenování knih.

+

bibletime

Nastavení spuštění

Z terminálu můžete použít BibleTime k otevření příslušného verše ve +výchozí bibli: +

bibletime --open-default-bible "<random>"

+ Pro otevření v dané pasáži, jako například Jan 3:16, použijte: +

bibletime --open-default-bible "Jan 3:16"

+ Můžete použít jména knih ve svém aktuálním jazyce pro pojmenování knih.

diff --git a/docs/handbook/cs/html/index.html b/docs/handbook/cs/html/index.html index d2ea7dc..ffda1ee 100644 --- a/docs/handbook/cs/html/index.html +++ b/docs/handbook/cs/html/index.html @@ -1,11 +1,11 @@ -Příručka BibleTime

Příručka BibleTime

Fred Saalbach

Jeffrey Hoyt

Martin Gruner

Thomas Abthorpe

2.3

Příručka BibleTime je součástí BibleTime.

Abstrakt

BibleTime je nástroj pro studium Bible založený na frameworku Sword.


Obsah

1. Úvod
O BibleTime
Dostupná díla
Motivace
2. Spuštění BibleTime
Jak spustit BibleTime
Spuštění BibleTime
Další správci oken
Nastavení spuštění
Spouštěcí sekvence.
3. Operace programu
Náhled programu
Části okna aplikace BibleTime
Knihovna
Časopis
Plocha
Vyhledávání v dílech
Vyhledávání textu v aktivním okně
Přístup k dialogu vyhledávání
Nastavení vyhledávání
Výsledky hledání
Správa knih
Nastavení cesty ke knihám
Instalace/aktualizace děl
Odebrání děl
Vyhledávací indexy
Export a tisk
4. Nastavení BibleTime
Dialog Nastavení BibleTime
+Příručka BibleTime +
Odkazy
Shortcuts index

Seznam tabulek

3.1. Typy vyhledávání
4.1. Písma Unicode
diff --git a/docs/handbook/de/docbook/hdbk-config.docbook b/docs/handbook/de/docbook/hdbk-config.docbook index 322e240..f02018c 100644 --- a/docs/handbook/de/docbook/hdbk-config.docbook +++ b/docs/handbook/de/docbook/hdbk-config.docbook @@ -9,6 +9,7 @@ Hauptmenü finden. angepasst werden. Sie können auf den Konfigurationsdialog über die Auswahl von Einstellungen &bibletime; einrichten. gelangen. + <guimenu>Display</guimenu> @@ -24,6 +25,22 @@ Optionen aus: usw.). Es sind mehrere eingebaute Vorlagen verfügbar. Nach Auswahl einer Vorlage wird im rechten Abschnitt eine Vorschau angezeigt,</para> </sect2> + + <sect2 id="hdbk-config-bt-desk"> + <title> + <guimenu>Desk</guimenu> + + Viele Funktionen, die vom &sword;-Backend zur Verfügung gestellt werden, +können nun in &bibletime; konfiguriert werden. Diese Funktionseigenschaften +sind im rechten Dialog dokumentiert. Ihnen ist außerdem ermöglicht, +Standardwerke zu definieren, wenn kein bestimmtes Werk in der Referenz +spezifiziert ist. Zum Beispiel wird die Standard-Bibel zur Darstellung des +Inhalts von Kreuzverweisen in der Bibel herangezogen. Wenn Sie über sie +fahren, wird die Lupe den Versinhalt anzeigen, auf den Bezug genommen wird, +gemäß der Standard-Bibel, die Sie spezifiziert haben. Unter Mitverwendung +von Textfiltern, können Sie die Erscheinungsform des Textes bestimmen. + + <guimenu>Languages</guimenu> @@ -131,7 +148,8 @@ Zeichenbereich ab.</entry> <ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS"> Crosswire's font directory</ulink> </entry> - <entry>Verschiedene Schriften sind auf der FTP-Seite von Crosswire verfügbar.</entry> + + <entry>Verschiedene Schriften sind auf der FTP-Site von &cbs; verfügbar.</entry> </row> <row> <entry> @@ -164,30 +182,26 @@ url="http://www.alanwood.net/unicode/fontsbyrange.html"> Unicode character ranges and the Unicode fonts that support them</ulink>).</para> </sect3> </sect2> - <sect2 id="hdbk-config-bt-desk"> - <title> - <guimenu>Desk</guimenu> - - Viele Funktionen, die vom Sword-Backend zur Verfügung gestellt werden, -können nun in &bibletime; konfiguriert werden. Diese Funktionseigenschaften -sind im rechten Dialog dokumentiert. Ihnen ist außerdem ermöglicht, -Standardwerke zu definieren, wenn kein bestimmtes Werk in der Referenz -spezifiziert ist. Zum Beispiel wird die Standard-Bibel zur Darstellung des -Inhalts von Kreuzverweisen in der Bibel herangezogen. Wenn Sie über sie -fahren, wird die Lupe den Versinhalt anzeigen, auf den Bezug genommen wird, -gemäß der Standard-Bibel, die Sie spezifiziert haben. - - + + - <guimenu>HotKeys</guimenu> + <guimenu>Shortcuts</guimenu> - Tastenkürzel sind spezielle Tastenbefehle, die an Stelle der Menüeinträge -oder Symbole verwendet werden können. Eine Anzahl von &bibletime;s Befehlen -hat bereits vordefinierte Tastenkürzel (dieser Abschnitt enthält eine -komplette Auflistung. Den meisten Befehlen von &bibletime; kann hier ein -Tastenkürzel zugewiesen werden. Dies ist sehr hilfreich, um die oftbenutzten -Funktionen schnell zu erreichen. + + Tastenkürzel (ehemals HotKeys) sind spezielle Tastenbefehle, die an Stelle +der Menüeinträge oder Symbole verwendet werden können. Eine Anzahl von +&bibletime;s Befehlen hat bereits vordefinierte Tastenkürzel (dieser Abschnitt enthält eine +komplette Auflistung). Den meisten Befehlen von &bibletime; kann hier ein +Tastenkürzel zugewiesen werden. Dies ist sehr hilfreich, um die +meistbenutzten Funktionen schnell zu erreichen. + + + + + + Im vorherigen Beispiel, F2, wurde dem Bibelstudien-HowTo ein sekundäres +Tastenkürzel, CTRL+2, zugewiesen. diff --git a/docs/handbook/de/docbook/hdbk-intro.docbook b/docs/handbook/de/docbook/hdbk-intro.docbook index cee8f4c..cb953bb 100644 --- a/docs/handbook/de/docbook/hdbk-intro.docbook +++ b/docs/handbook/de/docbook/hdbk-intro.docbook @@ -2,26 +2,26 @@ Einleitung Über &bibletime; + &bibletime; ist ein Bibelstudien-Werkzeug, das verschiedene Textarten und Sprachen unterstützt. Sogar große Anzahlen an Werk-Modulen können einfach installiert und verwaltet werden. Es basiert auf der Sword-Bibliothek, welche die +url="http://www.crosswire.org/sword">&sword;-Bibliothek, welche die zugrundeliegende Backend-Funktionalität für &bibletime; zur Verfügung stellt, so zum Beispiel um Bibeltexte anzuschauen, darin zu suchen, -usw. Sword ist das Hauptprodukt der Crosswire Bibelgesellschaft. +usw. &sword; ist das Hauptprodukt der &cbs;. &bibletime; wurde konzipiert, um mit Werken zu arbeiten, die in einem der -Formate vorliegen, die vom Sword-Projekt unterstützt werden. Vollständige +Formate vorliegen, die vom &sword;-Projekt unterstützt werden. Vollständige Informationen über die unterstützten Dokumentenformate sind auf den Entwicklerseiten -des Sword-Projektes der Crosswire Bibelgesellschaft zu finden. +des &sword;-Projektes der &cbs; zu finden. Vorhandene Werke - Über 200 Dokumente in 50 Sprachen sind auf dem Webserver der Crosswire Bibelgesellschaft -verfügbar. Dazu gehören: + Über 200 Dokumente in 50 Sprachen sind von der &cbs; erhältlich. Dazu gehören: Bibeln @@ -31,7 +31,7 @@ Kopfzeilen und/oder Fußzeilen im Text. Bibeln sind in vielen verschiedenen Sprachen verfügbar und nicht nur auf moderne Versionen beschränkt, sondern umfassen auch altertümliche Texte wie den Codex Leningradensis ("WLC", hebräisch), und die Septuaginta ("LXX", griechisch). Dies ist der -fortgeschrittenste Abschnitt in der Bibliothek des Sword-Projektes. +fortgeschrittenste Abschnitt in der Bibliothek des &sword;-Projektes. diff --git a/docs/handbook/de/docbook/hdbk-operation.docbook b/docs/handbook/de/docbook/hdbk-operation.docbook index 6753bc6..5aca987 100644 --- a/docs/handbook/de/docbook/hdbk-operation.docbook +++ b/docs/handbook/de/docbook/hdbk-operation.docbook @@ -64,7 +64,7 @@ Dialogfenster für verschlüsselte Dokumente, in dem Sie den Entschlüsselungs-Schlüssel für den Zugriff eingeben können. Für weitere Informationen über verschlüsselte Werke, lesen Sie bitte diese -Seite auf der Website der Crosswire Bibelgesellschaft. +Seite auf der Website der &cbs;. @@ -150,10 +150,11 @@ funktioniert. Bearbeiten Sie ihren eigenen Kommentar + Um Ihre eigenen Kommentare über Bibelabschnitte zu speichern, müssen Sie ein bestimmtes Werk von der Bibliothek der Crosswire Bibelgesellschaft -installieren. Dieses Werk heißt "Persönlicher Kommentar". +url="http://www.crosswire.org">&cbs; installieren. Dieses Werk heißt +"Persönlicher Kommentar". Wenn Sie den persönlichen Kommentar durch Klicken auf sein Symbol im Bücherregal mit der linken Maustaste öffnen, wird @@ -235,54 +236,78 @@ indem Sie einen der vordefinierten Suchbereiche aus der Liste Suchbereiche festlegen, indem Sie auf Einrichten... klicken. + Grundlegende Einführung in die Suchsyntax - Geben Sie Suchtermini getrennt von Leerzeichen ein. Standardmäßig wird die -Suchfunktion Ergebnisse zurückliefern, die auf jeden der Suchtermini -zutreffen (OR). Um nach allen Suchtermini zu suchen, trennen Sie sie mit -AND. - Sie können Platzhalter verwenden. '*' steht für jede Zeichensequenz, während -'?' auf jedes einzelne Zeichen zutrifft. Das Benutzen von Klammern erlaubt -Ihnen das Gruppieren der Suchbegriffe, z.B. '(Jesus OR Geist) AND Gott'. + + Geben Sie den zu suchenden Text separiert mit Leerzeichen ein. Standardmäßig +wird die Suchfunktion Ergebnisse zurückliefern, die auf alle Wörter +zutreffen. Wenn Sie irgend eines der eingegebenen Wörter finden möchten, +wählen Sie den Einige Wörter-Knopf aus. Falls Sie eine +komplexere Suche beabsichtigen, selektieren Sie den +Frei-Knopf. Sie können Syntax-Beispiele von Suchanfragen +durch Klicken auf Vollständige Syntax sehen. + + + Sie können Platzhalter verwenden. '*' steht für jede Anzahl von Zeichen, +während '?' auf jedes einzelne Zeichen zutrifft. Das Benutzen von Klammern +erlaubt Ihnen das Gruppieren der Suchbegriffe, z.B. '(Jesus OR Geist) AND +Gott'. + Um Text außerhalb des Haupttextes zu finden, geben Sie die Textart gefolgt -von einem ':' und dem Suchbegriff ein. Wollen Sie zum Beispiel nach der -Strong-Nummer H8077 suchen, benutzen Sie 'strong:H8077'. +von einem ':' und dem Suchbegriff ein. Beispiele sind in der unteren Tabelle +aufgeführt. + Verfügbare Textarten: Sucharten - + Präfix Bedeutung + Beispiel heading: durchsucht Kopfzeilen + heading:Jesus footnote: durchsucht Fußnoten + footnote:Moses strong: durchsucht Strong-Nummern + strong:G535 morph: durchsucht Morphologie-Codes + morph:N-GSM
- &bibletime; benutzt die Lucene Suchmaschine, um Suchen auszuführen. Sie hat -viele erweiterte Funktionen, Sie können hier mehr über Sie lesen: -http://lucene.apache.org/java/docs/index.html + + + Sie können mit der rechten Maustaste auf ein installiertes Werk klicken und +Über... auswählen, um zu sehen, welche der oben genannten +Suchkriterien für Sie zutreffen. Nicht alle Werke haben die eingebauten +Eigenschaften um diese Art von Suche durchzuführen. + + + &bibletime; benutzt die Lucene Suchmaschine, um Ihre Suchanfragen +auszuführen. Sie hat viele erweiterte Funktionen, Sie können hier mehr über +Sie lesen: +http://lucene.apache.org/java/docs/index.html.
+ Suchergebnisse Hier können Sie erkennen, wieviele Instanzen des Suchstrings gefunden @@ -349,9 +374,9 @@ eingelegt ist. Mit dieser Einrichtung können Sie sich mit einer Quelle von Werken (genannt "Bibliothek") in Verbindung setzen und ein oder mehrere Werke zu Ihrem lokalen Bücherregal übertragen. Diese Bibliotheken können lokal sein -(z.B. eine Sword-CD) oder entfernt-gelegen (z.B. Crosswires -Online-Repository der Sword-Module, oder eine andere Site, die Sword-Module -anbietet). Sie können Ihre Bibliotheken mit +(z.B. eine &sword;-CD) oder entfernt-gelegen (z.B. Crosswires +Online-Repository der &sword;-Module, oder eine andere Site, die +&sword;-Module anbietet). Sie können Ihre Bibliotheken mit Hinzufügen... und Löschen... verwalten. Um den Installations- oder Aktualisierungsvorgang zu starten, suchen Sie diff --git a/docs/handbook/de/docbook/hdbk-reference.docbook b/docs/handbook/de/docbook/hdbk-reference.docbook index b4b47e3..d32ad8a 100644 --- a/docs/handbook/de/docbook/hdbk-reference.docbook +++ b/docs/handbook/de/docbook/hdbk-reference.docbook @@ -7,7 +7,7 @@ in &bibletime; auftauchen und zwar mit allen Untereinträgen unterhalb ihrer jeweiligen Obermenüs. Sie können auch alle Kurzbefehle der Einträge nachschauen, ein komplettes Verzeichnis der Kurzbefehle finden Sie in diesem Abschnitt. +linkend="hdbk-reference-shortcuts">diesem Abschnitt. <guimenu>File</guimenu> @@ -423,10 +423,9 @@ nach.</para> </term> <listitem> <para> - <action>Bücherregal-Verwaltung</action>. Hiermit wird ein Dialog zur -Konfiguration und Verwaltung Ihres Bücherregals aufgerufen. Schauen Sie -bitte in <link linkend="hdbk-op-bookshelfmanager">diesem Abschnitt</link> -für Details nach.</para> + <action>Hiermit wird ein Dialog, zur &sword;-Konfiguration und Konfiguration +Ihrer Bücherregal-Verwaltung aufgerufen</action>. Schauen Sie bitte in <link +linkend="hdbk-op-bookshelfmanager">diesem Abschnitt</link> für Details nach.</para> </listitem> </varlistentry> </variablelist> @@ -797,7 +796,7 @@ assoziierten Symbolzeichen. </sect2> </sect1> - <sect1 id="hdbk-reference-hotkeys"> + <sect1 id="hdbk-reference-shortcuts"> <title>Tastenkürzel-Verzeichnis Dies ist ein Verzeichnis aller Tastenkürzel und ihrer korrespondierenden Beschreibung im Handbuch. Die Tastenkürzel sind (grob) alphabetisch @@ -808,7 +807,7 @@ mit angezeigt wird) oder die Tastenkürzel in diesem Abschnitt nachsehen. - +
Kapitel 4. BibleTime einrichten
Zurück   Weiter

Kapitel 4. BibleTime einrichten

Inhaltsverzeichnis

Dialog BibleTime konfigurieren
+Kapitel 4. BibleTime einrichten

Kapitel 4. BibleTime einrichten

In diesem Abschnitt finden Sie eine Übersicht, wie BibleTime zu konfigurieren ist. Sie können das Menü Einstellungen im Hauptmenü finden.

Dialog BibleTime konfigurieren

Die BibleTime Benutzeroberfläche kann auf vielfältige Art ihren Ansprüchen @@ -17,7 +17,17 @@ von Einstellungen Optionen aus:

  • Startlogo anzeigen

Anzeigenvorlagen definieren das Aussehen des Textes (Farben, Größe, usw.). Es sind mehrere eingebaute Vorlagen verfügbar. Nach Auswahl einer -Vorlage wird im rechten Abschnitt eine Vorschau angezeigt,

+Vorlage wird im rechten Abschnitt eine Vorschau angezeigt,

+ Desk +

Viele Funktionen, die vom Sword-Backend zur Verfügung gestellt werden, +können nun in BibleTime konfiguriert werden. Diese Funktionseigenschaften +sind im rechten Dialog dokumentiert. Ihnen ist außerdem ermöglicht, +Standardwerke zu definieren, wenn kein bestimmtes Werk in der Referenz +spezifiziert ist. Zum Beispiel wird die Standard-Bibel zur Darstellung des +Inhalts von Kreuzverweisen in der Bibel herangezogen. Wenn Sie über sie +fahren, wird die Lupe den Versinhalt anzeigen, auf den Bezug genommen wird, +gemäß der Standard-Bibel, die Sie spezifiziert haben. Unter Mitverwendung +von Textfiltern, können Sie die Erscheinungsform des Textes bestimmen.

Languages

Hier können Sie angeben, welche Sprache für die Buchnamen der Bibel verwendet werden soll. Stellen Sie (falls verfügbar) ihre Muttersprache ein, @@ -58,7 +68,7 @@ Zeichenbereich ab.

Eine neue Initiative für freie Unicode-Schriftarten.
Crosswire's font directory - Verschiedene Schriften sind auf der FTP-Seite von Crosswire verfügbar.
+ Verschiedene Schriften sind auf der FTP-Site von Crosswire Bible Society verfügbar.
Bitstream CyberBit Deckt fast den ganzen Unicode-Bereich ab, könnte aber BibleTime durch @@ -69,20 +79,12 @@ Hebr Teilweise Abdeckung, siehe die Information auf der angegebenen Seite.

Es gibt gute Listen mit Unicode-Schriftarten im Netz, so z.B. eine von Christoph Singer (Multilingual Unicode TrueType Fonts in the Internet), oder eine von Alan Wood ( Unicode character -ranges and the Unicode fonts that support them).

- Desk -

Viele Funktionen, die vom Sword-Backend zur Verfügung gestellt werden, -können nun in BibleTime konfiguriert werden. Diese Funktionseigenschaften -sind im rechten Dialog dokumentiert. Ihnen ist außerdem ermöglicht, -Standardwerke zu definieren, wenn kein bestimmtes Werk in der Referenz -spezifiziert ist. Zum Beispiel wird die Standard-Bibel zur Darstellung des -Inhalts von Kreuzverweisen in der Bibel herangezogen. Wenn Sie über sie -fahren, wird die Lupe den Versinhalt anzeigen, auf den Bezug genommen wird, -gemäß der Standard-Bibel, die Sie spezifiziert haben.

- HotKeys -

Tastenkürzel sind spezielle Tastenbefehle, die an Stelle der Menüeinträge -oder Symbole verwendet werden können. Eine Anzahl von BibleTimes Befehlen -hat bereits vordefinierte Tastenkürzel (dieser Abschnitt enthält eine -komplette Auflistung. Den meisten Befehlen von BibleTime kann hier ein -Tastenkürzel zugewiesen werden. Dies ist sehr hilfreich, um die oftbenutzten -Funktionen schnell zu erreichen.

+ranges and the Unicode fonts that support them).

+ Shortcuts +

Tastenkürzel (ehemals HotKeys) sind spezielle Tastenbefehle, die an Stelle +der Menüeinträge oder Symbole verwendet werden können. Eine Anzahl von +BibleTimes Befehlen hat bereits vordefinierte Tastenkürzel (dieser Abschnitt enthält eine +komplette Auflistung). Den meisten Befehlen von BibleTime kann hier ein +Tastenkürzel zugewiesen werden. Dies ist sehr hilfreich, um die +meistbenutzten Funktionen schnell zu erreichen.

Im vorherigen Beispiel, F2, wurde dem Bibelstudien-HowTo ein sekundäres +Tastenkürzel, CTRL+2, zugewiesen.

diff --git a/docs/handbook/de/html/hdbk-intro.html b/docs/handbook/de/html/hdbk-intro.html index f72957c..e797c80 100644 --- a/docs/handbook/de/html/hdbk-intro.html +++ b/docs/handbook/de/html/hdbk-intro.html @@ -1,19 +1,18 @@ -Kapitel 1. Einleitung

Kapitel 1. Einleitung

Über BibleTime

BibleTime ist ein Bibelstudien-Werkzeug, das verschiedene Textarten und +Kapitel 1. Einleitung

Kapitel 1. Einleitung

Über BibleTime

BibleTime ist ein Bibelstudien-Werkzeug, das verschiedene Textarten und Sprachen unterstützt. Sogar große Anzahlen an Werk-Modulen können einfach -installiert und verwaltet werden. Es basiert auf der Sword-Bibliothek, welche die +installiert und verwaltet werden. Es basiert auf der Sword-Bibliothek, welche die zugrundeliegende Backend-Funktionalität für BibleTime zur Verfügung stellt, so zum Beispiel um Bibeltexte anzuschauen, darin zu suchen, -usw. Sword ist das Hauptprodukt der Crosswire Bibelgesellschaft.

BibleTime wurde konzipiert, um mit Werken zu arbeiten, die in einem der -Formate vorliegen, die vom Sword-Projekt unterstützt werden. Vollständige +usw. Sword ist das Hauptprodukt der Crosswire Bible Society.

BibleTime wurde konzipiert, um mit Werken zu arbeiten, die in einem der +Formate vorliegen, die vom Sword-Projekt unterstützt werden. Vollständige Informationen über die unterstützten Dokumentenformate sind auf den Entwicklerseiten -des Sword-Projektes der Crosswire Bibelgesellschaft zu finden.

Vorhandene Werke

Über 200 Dokumente in 50 Sprachen sind auf dem Webserver der Crosswire Bibelgesellschaft -verfügbar. Dazu gehören: +des Sword-Projektes der Crosswire Bible Society zu finden.

Vorhandene Werke

Über 200 Dokumente in 50 Sprachen sind von der Crosswire Bible Society erhältlich. Dazu gehören:

Bibeln

Der vollständie Bibeltext mit optionalen Dingen wie Strong-Nummern, Kopfzeilen und/oder Fußzeilen im Text. Bibeln sind in vielen verschiedenen Sprachen verfügbar und nicht nur auf moderne Versionen beschränkt, sondern umfassen auch altertümliche Texte wie den Codex Leningradensis ("WLC", hebräisch), und die Septuaginta ("LXX", griechisch). Dies ist der -fortgeschrittenste Abschnitt in der Bibliothek des Sword-Projektes.

Bücher

Zu den verfügbaren Büchern gehören "Imitation of Christ", "Enuma Elish" und +fortgeschrittenste Abschnitt in der Bibliothek des Sword-Projektes.

Bücher

Zu den verfügbaren Büchern gehören "Imitation of Christ", "Enuma Elish" und "Josephus: Die vollständigen Werke"

Kommentare

Zu den verfügbaren Kommentaren gehören Klassiker wie John Wesleys "Notes on the Bible", Matthew Henrys Kommentar und Luthers "Kommentar über Galater". " Mit dem Persönlichen Kommentar sind Sie in der Lage diff --git a/docs/handbook/de/html/hdbk-op-bookshelfmanager.html b/docs/handbook/de/html/hdbk-op-bookshelfmanager.html index b5c6d13..c20926c 100644 --- a/docs/handbook/de/html/hdbk-op-bookshelfmanager.html +++ b/docs/handbook/de/html/hdbk-op-bookshelfmanager.html @@ -1,4 +1,4 @@ -Der Bücherregal Verwalter

Der Bücherregal Verwalter

Die Bücherregal-Verwaltung ist ein Werkzeug, das +Der Bücherregal Verwalter

Der Bücherregal Verwalter

Die Bücherregal-Verwaltung ist ein Werkzeug, das Ihnen die Verwaltung des Bücherregals ermöglicht. Sie können neue Werke zu Ihrem Bücherregal hinzufügen oder existierende Werke aktualisieren oder Sie aus dem Bücherregal entfernen. Greifen Sie darauf zu, indem Sie auf @@ -12,9 +12,9 @@ den Pfad der CD als einen Ihrer B eingelegt ist.

Werke installieren/updaten

Mit dieser Einrichtung können Sie sich mit einer Quelle von Werken (genannt "Bibliothek") in Verbindung setzen und ein oder mehrere Werke zu Ihrem lokalen Bücherregal übertragen. Diese Bibliotheken können lokal sein -(z.B. eine Sword-CD) oder entfernt-gelegen (z.B. Crosswires -Online-Repository der Sword-Module, oder eine andere Site, die Sword-Module -anbietet). Sie können Ihre Bibliotheken mit +(z.B. eine Sword-CD) oder entfernt-gelegen (z.B. Crosswires +Online-Repository der Sword-Module, oder eine andere Site, die +Sword-Module anbietet). Sie können Ihre Bibliotheken mit Hinzufügen... und Löschen... verwalten.

Um den Installations- oder Aktualisierungsvorgang zu starten, suchen Sie eine Bibliothek aus, mit der Sie sich verbinden wollen und einen lokalen diff --git a/docs/handbook/de/html/hdbk-op-output.html b/docs/handbook/de/html/hdbk-op-output.html index 0435d3a..9927c20 100644 --- a/docs/handbook/de/html/hdbk-op-output.html +++ b/docs/handbook/de/html/hdbk-op-output.html @@ -1,4 +1,4 @@ -Exortieren und Drucken

Exortieren und Drucken

An vielen Stellen können Sie ein Kontextmenü durch Klicken mit der +Exortieren und Drucken

Exortieren und Drucken

An vielen Stellen können Sie ein Kontextmenü durch Klicken mit der rechten Maustaste öffnen. Abhängig vom Kontext wird es Ihnen ermöglichen, Text mit Auswählen, Kopieren (zur Zwischenablage), diff --git a/docs/handbook/de/html/hdbk-op-parts.html b/docs/handbook/de/html/hdbk-op-parts.html index 3ef4fe6..1469237 100644 --- a/docs/handbook/de/html/hdbk-op-parts.html +++ b/docs/handbook/de/html/hdbk-op-parts.html @@ -1,4 +1,4 @@ -Elemente des BibleTime Fensters

Elemente des BibleTime Fensters

Das Bücherregal

Das Bücherregal enthält alle installierten Werke, nach Kategorie und Sprache +Elemente des BibleTime Fensters

Elemente des BibleTime Fensters

Das Bücherregal

Das Bücherregal enthält alle installierten Werke, nach Kategorie und Sprache sortiert. Es enthält auch einen Abschnitt namens "Lesezeichen". Hier können sie ihre eigenen Lesezeichen ablegen und darauf zugreifen.

Werke lesen

Wenn Sie Dokument auswählen wollen, klicken Sie einfach auf die gewünschte Dokumentengruppe (Bibeln, Kommentare, Lexika, Bücher, Andachten oder @@ -18,7 +18,7 @@ Werk. "Entschl Dialogfenster für verschlüsselte Dokumente, in dem Sie den Entschlüsselungs-Schlüssel für den Zugriff eingeben können. Für weitere Informationen über verschlüsselte Werke, lesen Sie bitte diese -Seite auf der Website der Crosswire Bibelgesellschaft.

In Werken suchen

Sie können ein Werk durchsuchen, indem Sie mit der rechten +Seite auf der Website der Crosswire Bible Society.

In Werken suchen

Sie können ein Werk durchsuchen, indem Sie mit der rechten Maustaste auf sein Symbol klicken und "Suche in..." auswählen. Indem Sie Umschalt und auf andere Werke klicken, können Sie mehr als ein Werk auswählen. Dann folgen Sie demselben @@ -61,8 +61,8 @@ vollst überlassen können. Um letzteres zu erreichen, wählen Sie eines der verfügbaren automatischen Anordnungsarten in FensterAnordnungs-Art aus. Probieren Sie's einfach aus, es ist leicht und funktioniert.

Bearbeiten Sie ihren eigenen Kommentar

Um Ihre eigenen Kommentare über Bibelabschnitte zu speichern, müssen Sie ein -bestimmtes Werk von der Bibliothek der Crosswire Bibelgesellschaft -installieren. Dieses Werk heißt "Persönlicher Kommentar".

Wenn Sie den persönlichen Kommentar durch Klicken auf sein Symbol im +bestimmtes Werk von der Bibliothek der Crosswire Bible Society installieren. Dieses Werk heißt +"Persönlicher Kommentar".

Wenn Sie den persönlichen Kommentar durch Klicken auf sein Symbol im Bücherregal mit der linken Maustaste öffnen, wird dieser im Nur-Lese-Modus geöffnet. Es wird Ihnen nicht möglich sein, ihn in diesem Modus zu editieren. Falls Sie Anmerkungen zu Ihrem persönlichen diff --git a/docs/handbook/de/html/hdbk-op-search.html b/docs/handbook/de/html/hdbk-op-search.html index 263e039..2f1a024 100644 --- a/docs/handbook/de/html/hdbk-op-search.html +++ b/docs/handbook/de/html/hdbk-op-search.html @@ -1,4 +1,4 @@ -In Werken suchen

In Werken suchen

Nach Text in einem geöffneten Lesefenster suchen

Sie können nach einem Wort oder Ausdruck im offenen Lesefenster (z.B. in dem +In Werken suchen

In Werken suchen

Nach Text in einem geöffneten Lesefenster suchen

Sie können nach einem Wort oder Ausdruck im offenen Lesefenster (z.B. in dem Bibel-Kapitel, das Sie gerade lesen) suchen, ganz wie Sie es von anderen Programmen her gewohnt sind. Diese Funktion kann entweder durch Klicken mit der rechten Maustaste und Auswahl von @@ -20,17 +20,26 @@ auftun, in dem Sie die zu durchsuchenden Werke w indem Sie einen der vordefinierten Suchbereiche aus der Liste Bereich: auswählen. Desweiteren können Sie Ihre eigenen Suchbereiche festlegen, indem Sie auf Einrichten... -klicken.

Grundlegende Einführung in die Suchsyntax

Geben Sie Suchtermini getrennt von Leerzeichen ein. Standardmäßig wird die -Suchfunktion Ergebnisse zurückliefern, die auf jeden der Suchtermini -zutreffen (OR). Um nach allen Suchtermini zu suchen, trennen Sie sie mit -AND.

Sie können Platzhalter verwenden. '*' steht für jede Zeichensequenz, während -'?' auf jedes einzelne Zeichen zutrifft. Das Benutzen von Klammern erlaubt -Ihnen das Gruppieren der Suchbegriffe, z.B. '(Jesus OR Geist) AND Gott'.

Um Text außerhalb des Haupttextes zu finden, geben Sie die Textart gefolgt -von einem ':' und dem Suchbegriff ein. Wollen Sie zum Beispiel nach der -Strong-Nummer H8077 suchen, benutzen Sie 'strong:H8077'.

Verfügbare Textarten: -

Tabelle 3.1. Sucharten

PräfixBedeutung
heading:durchsucht Kopfzeilen
footnote:durchsucht Fußnoten
strong:durchsucht Strong-Nummern
morph:durchsucht Morphologie-Codes


BibleTime benutzt die Lucene Suchmaschine, um Suchen auszuführen. Sie hat -viele erweiterte Funktionen, Sie können hier mehr über Sie lesen: -http://lucene.apache.org/java/docs/index.html

Suchergebnisse

Hier können Sie erkennen, wieviele Instanzen des Suchstrings gefunden +klicken.

Grundlegende Einführung in die Suchsyntax

Geben Sie den zu suchenden Text separiert mit Leerzeichen ein. Standardmäßig +wird die Suchfunktion Ergebnisse zurückliefern, die auf alle Wörter +zutreffen. Wenn Sie irgend eines der eingegebenen Wörter finden möchten, +wählen Sie den Einige Wörter-Knopf aus. Falls Sie eine +komplexere Suche beabsichtigen, selektieren Sie den +Frei-Knopf. Sie können Syntax-Beispiele von Suchanfragen +durch Klicken auf Vollständige Syntax sehen. +

Sie können Platzhalter verwenden. '*' steht für jede Anzahl von Zeichen, +während '?' auf jedes einzelne Zeichen zutrifft. Das Benutzen von Klammern +erlaubt Ihnen das Gruppieren der Suchbegriffe, z.B. '(Jesus OR Geist) AND +Gott'.

Um Text außerhalb des Haupttextes zu finden, geben Sie die Textart gefolgt +von einem ':' und dem Suchbegriff ein. Beispiele sind in der unteren Tabelle +aufgeführt.

Verfügbare Textarten: +

Tabelle 3.1. Sucharten

PräfixBedeutungBeispiel
heading:durchsucht Kopfzeilenheading:Jesus
footnote:durchsucht Fußnotenfootnote:Moses
strong:durchsucht Strong-Nummernstrong:G535
morph:durchsucht Morphologie-Codesmorph:N-GSM


Tipp

Sie können mit der rechten Maustaste auf ein installiertes Werk klicken und +Über... auswählen, um zu sehen, welche der oben genannten +Suchkriterien für Sie zutreffen. Nicht alle Werke haben die eingebauten +Eigenschaften um diese Art von Suche durchzuführen.

BibleTime benutzt die Lucene Suchmaschine, um Ihre Suchanfragen +auszuführen. Sie hat viele erweiterte Funktionen, Sie können hier mehr über +Sie lesen: +http://lucene.apache.org/java/docs/index.html.

Suchergebnisse

Hier können Sie erkennen, wieviele Instanzen des Suchstrings gefunden wurden, nach Werken sortiert. Das Klicken mit der rechten Maustaste erlaubt Ihnen alle in einem bestimmten Werk gefundenen Verse auf einmal zu kopieren, zu speichern oder zu drucken. Dies diff --git a/docs/handbook/de/html/hdbk-op.html b/docs/handbook/de/html/hdbk-op.html index b9f92a9..f7bcc3f 100644 --- a/docs/handbook/de/html/hdbk-op.html +++ b/docs/handbook/de/html/hdbk-op.html @@ -1,4 +1,4 @@ -Kapitel 3. Programmbedienung

Kapitel 3. Programmbedienung

Programmüberblick

So sieht eine typische BibleTime-Sitzung aus: +Kapitel 3. Programmbedienung

Kapitel 3. Programmbedienung

Programmüberblick

So sieht eine typische BibleTime-Sitzung aus:

Das BibleTime-Applikations-Fenster

Sie können leicht die verschiedenen Abschnitte des Applikations-Fensters erkennen. Das Fenster oben links erlaubt das Öffnen installierter Werke im diff --git a/docs/handbook/de/html/hdbk-reference-hotkeys.html b/docs/handbook/de/html/hdbk-reference-shortcuts.html similarity index 95% rename from docs/handbook/de/html/hdbk-reference-hotkeys.html rename to docs/handbook/de/html/hdbk-reference-shortcuts.html index 6b820f4..ff641f1 100644 --- a/docs/handbook/de/html/hdbk-reference-hotkeys.html +++ b/docs/handbook/de/html/hdbk-reference-shortcuts.html @@ -1,4 +1,4 @@ -Tastenkürzel-Verzeichnis

Tastenkürzel-Verzeichnis

Dies ist ein Verzeichnis aller Tastenkürzel und ihrer korrespondierenden +Tastenkürzel-Verzeichnis

Tastenkürzel-Verzeichnis

Dies ist ein Verzeichnis aller Tastenkürzel und ihrer korrespondierenden Beschreibung im Handbuch. Die Tastenkürzel sind (grob) alphabetisch sortiert. Wenn Sie unmittelbar nachschauen möchten, welches Tastenkürzel eine bestimmte Menüfunktion hat, so können Sie entweder den Menüeintrag in @@ -67,9 +67,9 @@ Kacheln. setzt den Staffelmodus für die Fensteranordnung. StrgL - Change location. Changes focus to the toolbar field for the selected work. + Ort ändern. Wechselt den Fokus zur Werkzeugleiste des selektierten Werkes. StrgN - Search with works of this window. + Das Suchfenster mit den Werken dieses Fensters öffnen. StrgO SucheIn offenen Werken diff --git a/docs/handbook/de/html/hdbk-reference-toolbar.html b/docs/handbook/de/html/hdbk-reference-toolbar.html deleted file mode 100644 index aa71064..0000000 --- a/docs/handbook/de/html/hdbk-reference-toolbar.html +++ /dev/null @@ -1,10 +0,0 @@ -Toolbar reference

Toolbar reference

Please review the preceding -section for an explanation of the buttons that you find on the -toolbar. You can also move the cursor over a button and wait a few -seconds to activate the button's tooltip with a short description.

Sie können die Werkzeugleiste ihren Bedürfnissen anpassen. Bitte benutzen -Sie den folgenden Eintrag aus dem Hauptmenü: -

- - SettingsConfigure toolbars -

Werkzeugleisten einrichten

Please see this -section for detailed instructions.

diff --git a/docs/handbook/de/html/hdbk-reference-works.html b/docs/handbook/de/html/hdbk-reference-works.html index f0edda3..ebd86ca 100644 --- a/docs/handbook/de/html/hdbk-reference-works.html +++ b/docs/handbook/de/html/hdbk-reference-works.html @@ -1,4 +1,4 @@ -Werksreferenz

Werksreferenz

+Werksreferenz

Werksreferenz

In diesem Abschnitt finden Sie Beschreibungen der mit geöffneten Werken assoziierten Symbolzeichen.

@@ -85,4 +85,4 @@ assoziierten Symbolzeichen.

Wählt ein zusätzliches Glossar oder eine zusätzliche Andacht aus.

-

+

diff --git a/docs/handbook/de/html/hdbk-reference.html b/docs/handbook/de/html/hdbk-reference.html index d4a54bc..c8e2159 100644 --- a/docs/handbook/de/html/hdbk-reference.html +++ b/docs/handbook/de/html/hdbk-reference.html @@ -1,4 +1,4 @@ -Kapitel 5. Referenz

Kapitel 5. Referenz

Hauptmenü-Referenz

In diesem Abschnitt finden Sie detaillierte Beschreibungen aller Einträge im BibleTime-Hauptmenü. Sie sind in der Reihenfolge angeordnet, wie Sie auch in BibleTime auftauchen und zwar mit allen Untereinträgen unterhalb ihrer jeweiligen Obermenüs. Sie können auch alle Kurzbefehle der Einträge -nachschauen, ein komplettes Verzeichnis der Kurzbefehle finden Sie in diesem Abschnitt.

+nachschauen, ein komplettes Verzeichnis der Kurzbefehle finden Sie in diesem Abschnitt.

File

@@ -122,10 +122,8 @@ nach.

SettingsBookshelf Manager (F4)

- Bücherregal-Verwaltung. Hiermit wird ein Dialog zur -Konfiguration und Verwaltung Ihres Bücherregals aufgerufen. Schauen Sie -bitte in diesem Abschnitt -für Details nach.

+ Hiermit wird ein Dialog, zur Sword-Konfiguration und Konfiguration +Ihrer Bücherregal-Verwaltung aufgerufen. Schauen Sie bitte in diesem Abschnitt für Details nach.

Help

diff --git a/docs/handbook/de/html/hdbk-startsequence.html b/docs/handbook/de/html/hdbk-startsequence.html index 7fa538c..283380b 100644 --- a/docs/handbook/de/html/hdbk-startsequence.html +++ b/docs/handbook/de/html/hdbk-startsequence.html @@ -1,4 +1,4 @@ -Start-Sequenz

Start-Sequenz

Wenn BibleTime startet, könnten Sie folgende Meldungen vor dem Erscheinen +Start-Sequenz

Start-Sequenz

Wenn BibleTime startet, könnten Sie folgende Meldungen vor dem Erscheinen des Hauptfensters sehen:

Bookshelf Manager

diff --git a/docs/handbook/de/html/hdbk-term.html b/docs/handbook/de/html/hdbk-term.html index 00fcb7e..c8644ea 100644 --- a/docs/handbook/de/html/hdbk-term.html +++ b/docs/handbook/de/html/hdbk-term.html @@ -1,13 +1,11 @@ -Kapitel 2. BibleTime starten

Kapitel 2. BibleTime starten

Wie BibleTime zu starten ist

BibleTime starten

BibleTime ist eine ausführbare Datei, die in Ihrem Desktop integriert +Kapitel 2. BibleTime starten

Kapitel 2. BibleTime starten

Wie BibleTime zu starten ist

BibleTime starten

BibleTime ist eine ausführbare Datei, die in Ihrem Desktop integriert ist. Sie können BibleTime aus dem Startmenü mit folgendem Symbol starten:

BibleTime-Start-Symbol

BibleTime kann auch von der Kommandozeile eines Terminals aufgerufen werden. Um BibleTime zu starten, öffnen Sie ein Terminal-Fenster und geben Sie folgendes ein: -

BibleTime

Andere Fenstermanager

BibleTime kann mit anderen Fenstermanagern wie Gnome, BlackBox, FluxBox, -OpenBox oder Sawfish verwendet werden, vorausgesetzt, dass die -entsprechenden Basis-Bibliotheken bereits auf Ihrem Rechner installiert -sind.

Konfiguration des Startverhaltens

Von einem Terminal aus können Sie BibleTime folgendermaßen verwenden, um -einen Zufallsvers aus der Standardbibel anzeigen zu lassen: -

bibletime --open-default-bible
-      "<random>"

Um einen bestimmten Vers wie z.B. Joh. 3,16 aufzuschlagen: -

bibletime --open-default-bible "Joh 3:16"

Sie können auch Buchnamen in Ihrer gegenwärtigen Buchnamen-Sprache benutzen.

+

bibletime

Konfiguration des Startverhaltens

Von einem Terminal aus können Sie BibleTime folgendermaßen verwenden, um +einen Zufallsvers aus der Standardbibel anzeigen zu lassen: +

bibletime --open-default-bible "<random>"

+ Um einen bestimmten Vers wie z.B. Joh. 3,16 aufzuschlagen: +

bibletime --open-default-bible "Joh 3:16"

+ Sie können auch Buchnamen in Ihrer gegenwärtigen Buchnamen-Sprache benutzen.

diff --git a/docs/handbook/de/html/index.html b/docs/handbook/de/html/index.html index 17ac774..89a92f6 100644 --- a/docs/handbook/de/html/index.html +++ b/docs/handbook/de/html/index.html @@ -1,11 +1,12 @@ -Das BibleTime-Handbuch

Das BibleTime-Handbuch

Fred Saalbach

Jeffrey Hoyt

Martin Gruner

Thomas Abthorpe

2.3

Der BibleTime-Hilfedialog ist ein Teil von BibleTime.

Zusammenfassung

BibleTime ist ein Bibelstudien-Werkzeug, das auf dem Sword-System basiert.


Inhaltsverzeichnis

1. Einleitung
Über BibleTime
Vorhandene Werke
Motivation
2. BibleTime starten
Wie BibleTime zu starten ist
BibleTime starten
Andere Fenstermanager
Konfiguration des Startverhaltens
Start-Sequenz
3. Programmbedienung
Programmüberblick
Elemente des BibleTime Fensters
Das Bücherregal
Die Lupe
Die Arbeitsfläche
In Werken suchen
Nach Text in einem geöffneten Lesefenster suchen
Auf den Suchdialog zugreifen
Such-Konfiguration
Suchergebnisse
Der Bücherregal Verwalter
Bücherregal-Pfade einrichten
Werke installieren/updaten
Werk(e) entfernen
Suchindizes
Exortieren und Drucken
4. BibleTime einrichten
Dialog BibleTime konfigurieren
+Das BibleTime-Handbuch +
Werksreferenz
Tastenkürzel-Verzeichnis

Tabellenverzeichnis

3.1. Sucharten
4.1. Unicode Schriftarten
diff --git a/docs/handbook/en/docbook/hdbk-config.docbook b/docs/handbook/en/docbook/hdbk-config.docbook index 81f9bed..a829ace 100644 --- a/docs/handbook/en/docbook/hdbk-config.docbook +++ b/docs/handbook/en/docbook/hdbk-config.docbook @@ -12,6 +12,7 @@ Settings Configure &bibletime;. + <guimenu>Display</guimenu> @@ -27,6 +28,23 @@ size etc.). Various built-in templates are available. If you select one, you will see a preview on the right pane.</para> </sect2> + + <sect2 id="hdbk-config-bt-desk"> + <title> + <guimenu>Desk</guimenu> + + Many features provided by the &sword; backend can now be + customized in &bibletime;. These features are documented + right in the dialog. You also have the possibility to specify + standard works that should be used when no specific work is + specified in a reference. An example: The standard Bible is used + to display the content of cross references in the Bible. When you + hover over them, the Mag will show the content of the verses + referred to, according to the standard Bible you + specified. With the use of text filters, you can control the + appearance of the text. + + <guimenu>Languages</guimenu> @@ -139,8 +157,9 @@ <ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS"> Crosswire's font directory</ulink> </entry> - <entry>Several fonts available from the Crosswire Bible - Society Ftp site.</entry> + + <entry>Several fonts available from the &cbs; + FTP site.</entry> </row> <row> <entry> @@ -177,31 +196,27 @@ them</ulink>).</para> </sect3> </sect2> - <sect2 id="hdbk-config-bt-desk"> - <title> - <guimenu>Desk</guimenu> - - Many features provided by the Sword backend can now be - customized in &bibletime;. These features are documented - right in the dialog. You also have the possibility to specify - standard works that should be used when no specific work is - specified in a reference. An example: The standard Bible is used - to display the content of cross references in the Bible. When you - hover over them, the Mag will show the content of the verses - referred to, according to the standard Bible you - specified. - - + + - <guimenu>HotKeys</guimenu> + <guimenu>Shortcuts</guimenu> - HotKeys are special key commands that can be used in the - place of the menu items and icons. A number of &bibletime;'s - commands have predefined HotKeys (see - this section for a - complete listing). Most of &bibletime;'s commands can be - assigned HotKeys here. This is very helpful to quickly access the - functions that you need the most. + + Shortcuts (previously known as HotKeys) are special key + commands that can be used in the + place of the menu items and icons. A number of &bibletime;'s + commands have predefined Shortcuts (see + this section for a + complete listing). Most of &bibletime;'s commands can be + assigned Shortcuts. This is very helpful to quickly access the + functions that you need the most. + + + + + + In the preceding example, F2, Bible Study Howto has a + secondary shortcut defined, CTRL+2. diff --git a/docs/handbook/en/docbook/hdbk-intro.docbook b/docs/handbook/en/docbook/hdbk-intro.docbook index ce72462..3cb1b99 100644 --- a/docs/handbook/en/docbook/hdbk-intro.docbook +++ b/docs/handbook/en/docbook/hdbk-intro.docbook @@ -2,27 +2,26 @@ Introduction About &bibletime; + &bibletime; is a Bible study tool with support for - different types of texts and languages. Even large amounts of works - modules are easy to install and manage. It is built on the - Sword library, - which provides the back-end functionality for &bibletime;, such - as viewing Bible text, searching etc. Sword is the flagship product - of the Crosswire Bible - Society. + different types of texts and languages. Even large amounts of works + modules are easy to install and manage. It is built on the + &sword; library, + which provides the back-end functionality for &bibletime;, such + as viewing Bible text, searching etc. &sword; is the flagship product + of the &cbs;. &bibletime; is designed to be used with works encoded in - one of the formats supported by the Sword project. Complete - information on the supported document formats can be found in the - - developers section of the Sword Project, Crosswire Bible - Society. + one of the formats supported by the &sword; project. Complete + information on the supported document formats can be found in the + + developers section of the &sword; Project, &cbs;. Available works Over 200 documents in 50 languages are available from the - Crosswire Bible - Society. These include: + &cbs;. + These include: Bibles @@ -33,7 +32,7 @@ only modern versions, but also ancient texts like the Codex Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is the most advanced section in the library of - the Sword project. + the &sword; project. diff --git a/docs/handbook/en/docbook/hdbk-operation.docbook b/docs/handbook/en/docbook/hdbk-operation.docbook index abf7062..7ab4ec9 100644 --- a/docs/handbook/en/docbook/hdbk-operation.docbook +++ b/docs/handbook/en/docbook/hdbk-operation.docbook @@ -71,7 +71,7 @@ key to access the work. For additional information on locked works, please see - this page on the Crosswire Bible Society web + this page on the &cbs; web site. @@ -168,11 +168,11 @@ Editing your own commentary + To be able to store your own comments about parts of the - Bible, you have install a certain work from the library of the - Crosswire Bible - Society. This work is called "Personal - commentary". + Bible, you have install a certain work from the library of the + &cbs;. + This work is called "Personal commentary". If you open the personal commentary by clicking on its symbol in the Bookshelf with a @@ -211,7 +211,7 @@ are used to from other programs. This function can be reached either by clicking with the right mouse button and selecting - Find..., or by using the hotkey + Find..., or by using the shortcut &Ctrl;F. Read on to learn how you can search in entire works. @@ -266,57 +266,79 @@ ranges by clicking the Setup ranges button. + Basic Search Syntax Introduction - Enter search terms separated by spaces. By default the - search function will return results that match any of the - search terms (OR). To search for all the terms separate the - terms by AND. - You can use wildcards: '*' matches any sequence of - characters, while '?' matches any single character. The use of - brackets allows you to group your search terms, e.g. '(Jesus OR - spirit) AND God'. + + Enter the search phrase separated by spaces. By default the + search function will return results that match all the + words. If you want to find any of the words entered, select + the Some words button. If you want to + perform a more complex search, select the + Free button. You can see examples of + searches by clicking on full syntax. + + + You can use wildcards: '*' matches any number of + characters, while '?' will match any single character. The use of + brackets allows you to group your search terms, e.g. '(Jesus OR + spirit) AND God'. + To search text other than the main text, enter the text - type followed by ':', and then the search term. For example, to - search for the Strong's number H8077, use - 'strong:H8077'. + type followed by ':', and then the search term. Refer to the + table below for examples. + Available text types: Search Types - + Prefix Meaning + Example heading: searches headings + heading:Jesus footnote: searches footnotes + footnote:Moses strong: searches Strong's Numbers + strong:G535 morph: searches morphology codes + morph:N-GSM
+ + + You can right click on an installed work and select + About to find which of the above search + criteria may work for you. Not all works have the + built in features for performing this type of search. + + &bibletime; uses the Lucene search engine to perform your - searches. It has many advanced features, and you can read more - about it here: - - http://lucene.apache.org/java/docs/index.html + searches. It has many advanced features, and you can read more + about it here: + + http://lucene.apache.org/java/docs/index.html.
+ Search results Here you can see how many instances of the search string @@ -387,9 +409,9 @@ Install/update work(s) With this facility, you can connect to a repository of works (called "library"), and transfer one or more works to your - local Bookshelf. These libraries may be local (e.g. a Sword CD), - or remote (e.g. Crosswire's online repository of Sword modules, - or another site offering Sword modules). You can manage your + local Bookshelf. These libraries may be local (e.g. a &sword; CD), + or remote (e.g. Crosswire's online repository of &sword; modules, + or another site offering &sword; modules). You can manage your libraries with Add library and Delete library. diff --git a/docs/handbook/en/docbook/hdbk-reference.docbook b/docs/handbook/en/docbook/hdbk-reference.docbook index 1ee4cc9..111fba9 100644 --- a/docs/handbook/en/docbook/hdbk-reference.docbook +++ b/docs/handbook/en/docbook/hdbk-reference.docbook @@ -6,9 +6,9 @@ entries in the main menu of &bibletime;. They are ordered in just the way they appear in &bibletime;, with all the sub-items listed under the major menu item they belong to. You can also see - the hotkey of each item;a complete listing of all hotkeys can be + the shortcut of each item;a complete listing of all shortcuts can be found in - this section. + this section. <guimenu>File</guimenu> @@ -435,7 +435,7 @@ </term> <listitem> <para> - <action>Opens a dialog where you can change your Sword + <action>Opens a dialog where you can change your &sword; configuration and manage your bookshelf</action>. Please see <link linkend="hdbk-op-bookshelfmanager">this section</link> for details.</para> @@ -811,22 +811,22 @@ </sect2> </sect1> - <sect1 id="hdbk-reference-hotkeys"> - <title>HotKeys index - This is index of all hotkeys and their corresponding - description in the handbook. The hotkeys are sorted (roughly) - alphabetical. If you want to directly find out which hotkey a + + Shortcuts index + This is index of all shortcuts and their corresponding + description in the handbook. The shortcuts are sorted (roughly) + alphabetical. If you want to directly find out which shortcuts a certain menu item has, you can either look at the entry itself in - &bibletime; (as it always shows the hotkey), or you can look it + &bibletime; (as it always shows the shortcut), or you can look it up in this section. - + - Hotkey + Shortcut Description diff --git a/docs/handbook/en/docbook/hdbk-start.docbook b/docs/handbook/en/docbook/hdbk-start.docbook index 111985d..77cc67d 100644 --- a/docs/handbook/en/docbook/hdbk-start.docbook +++ b/docs/handbook/en/docbook/hdbk-start.docbook @@ -1,7 +1,9 @@ Starting &bibletime; + How to start &bibletime; + Starting &bibletime; &bibletime; is an executable file that is integrated @@ -15,29 +17,24 @@ &bibletime; start icon + &bibletime; can also be launched from a terminal command prompt. To launch &bibletime;, open a terminal window and type: - &bibletime; - - - Other window managers - &bibletime; can be used with other window managers such - as Gnome, BlackBox, Fluxbox, OpenBox or Sawfish, providing the - appropriate base libraries are already - installed on your computer. + bibletime + Startup customization From a terminal you can use &bibletime; to open a - random verse in the default bible: - bibletime --open-default-bible - "<random>"To open at a given passage like John - 3:16, use: - bibletime --open-default-bible "John 3:16"You - can also use booknames in your current bookname language. + random verse in the default bible: + bibletime --open-default-bible "<random>" + To open at a given passage like John 3:16, use: + bibletime --open-default-bible "John 3:16" + You can also use booknames in your current bookname language.
+ Startup sequence As &bibletime; launches you may see the following screens diff --git a/docs/handbook/en/docbook/index.docbook b/docs/handbook/en/docbook/index.docbook index 7671567..5eb8415 100644 --- a/docs/handbook/en/docbook/index.docbook +++ b/docs/handbook/en/docbook/index.docbook @@ -4,6 +4,7 @@ [ BibleTime'> Sword'> + Crosswire Bible Society'> KDE'> Qt'> @@ -47,14 +48,14 @@ The &bibletime; handbook is part of &bibletime;. - 2009-09 - 2.3 + 2009-10 + 2.4 - &bibletime; is a Bible study tool based on the Sword - framework. + &bibletime; is a Bible study tool based on the &sword; + framework. - QT4 + Qt4 bibletime sword crosswire diff --git a/docs/handbook/en/html/hdbk-config.html b/docs/handbook/en/html/hdbk-config.html index ccf8aa1..5ef0953 100644 --- a/docs/handbook/en/html/hdbk-config.html +++ b/docs/handbook/en/html/hdbk-config.html @@ -1,11 +1,11 @@ -Chapter 4. Configuring BibleTime

Chapter 4. Configuring BibleTime

Table of Contents

Configure BibleTime Dialog
+Chapter 4. Configuring BibleTime

Chapter 4. Configuring BibleTime

In this section you find an overview to configure BibleTime, which can be found under Settings in the main menu.

Configure BibleTime Dialog

The BibleTime user interface can be customized in many @@ -18,7 +18,18 @@ following options:

  • Show startup logo

Display templates define the rendering of text (colors, size etc.). Various built-in templates are available. If you - select one, you will see a preview on the right pane.

+ select one, you will see a preview on the right pane.

+ Desk +

Many features provided by the Sword backend can now be + customized in BibleTime. These features are documented + right in the dialog. You also have the possibility to specify + standard works that should be used when no specific work is + specified in a reference. An example: The standard Bible is used + to display the content of cross references in the Bible. When you + hover over them, the Mag will show the content of the verses + referred to, according to the standard Bible you + specified. With the use of text filters, you can control the + appearance of the text.

Languages

Here you can specify which language should be used for the biblical booknames. Set this to your native language, if it is @@ -65,8 +76,8 @@ A new free Unicode font initiative. Crosswire's font directory - Several fonts available from the Crosswire Bible - Society Ftp site. + Several fonts available from the Crosswire Bible Society + FTP site. Bitstream CyberBit Covers almost the entire range of Unicode, but @@ -83,22 +94,14 @@ Alan Wood ( Unicode character ranges and the Unicode fonts that support - them).

- Desk -

Many features provided by the Sword backend can now be - customized in BibleTime. These features are documented - right in the dialog. You also have the possibility to specify - standard works that should be used when no specific work is - specified in a reference. An example: The standard Bible is used - to display the content of cross references in the Bible. When you - hover over them, the Mag will show the content of the verses - referred to, according to the standard Bible you - specified.

- HotKeys -

HotKeys are special key commands that can be used in the - place of the menu items and icons. A number of BibleTime's - commands have predefined HotKeys (see - this section for a - complete listing). Most of BibleTime's commands can be - assigned HotKeys here. This is very helpful to quickly access the - functions that you need the most.

+ them).

+ Shortcuts +

Shortcuts (previously known as HotKeys) are special key + commands that can be used in the + place of the menu items and icons. A number of BibleTime's + commands have predefined Shortcuts (see + this section for a + complete listing). Most of BibleTime's commands can be + assigned Shortcuts. This is very helpful to quickly access the + functions that you need the most.

In the preceding example, F2, Bible Study Howto has a + secondary shortcut defined, CTRL+2.

diff --git a/docs/handbook/en/html/hdbk-intro.html b/docs/handbook/en/html/hdbk-intro.html index dc03919..656b3c4 100644 --- a/docs/handbook/en/html/hdbk-intro.html +++ b/docs/handbook/en/html/hdbk-intro.html @@ -1,25 +1,23 @@ -Chapter 1. Introduction

Chapter 1. Introduction

About BibleTime

BibleTime is a Bible study tool with support for - different types of texts and languages. Even large amounts of works - modules are easy to install and manage. It is built on the - Sword library, - which provides the back-end functionality for BibleTime, such - as viewing Bible text, searching etc. Sword is the flagship product - of the Crosswire Bible - Society.

BibleTime is designed to be used with works encoded in - one of the formats supported by the Sword project. Complete - information on the supported document formats can be found in the - - developers section of the Sword Project, Crosswire Bible - Society.

Available works

Over 200 documents in 50 languages are available from the - Crosswire Bible - Society. These include: +Chapter 1. Introduction

Chapter 1. Introduction

About BibleTime

BibleTime is a Bible study tool with support for + different types of texts and languages. Even large amounts of works + modules are easy to install and manage. It is built on the + Sword library, + which provides the back-end functionality for BibleTime, such + as viewing Bible text, searching etc. Sword is the flagship product + of the Crosswire Bible Society.

BibleTime is designed to be used with works encoded in + one of the formats supported by the Sword project. Complete + information on the supported document formats can be found in the + + developers section of the Sword Project, Crosswire Bible Society.

Available works

Over 200 documents in 50 languages are available from the + Crosswire Bible Society. + These include:

Bibles

The full Bible text, with optional things like Strong's Numbers, headings and/or footnotes in the text. Bibles are available in many languages, and include not only modern versions, but also ancient texts like the Codex Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is the most advanced section in the library of - the Sword project.

Books

Books available include "Imitation of Christ", "Enuma + the Sword project.

Books

Books available include "Imitation of Christ", "Enuma Elish", and "Josephus: The Complete Works"

Commentaries

Commentaries available include classics like John Wesley's "Notes on the Bible", Matthew Henry's commentary and Luther's "Commentary on Galatians." With the diff --git a/docs/handbook/en/html/hdbk-op-bookshelfmanager.html b/docs/handbook/en/html/hdbk-op-bookshelfmanager.html index 2e6357b..d3080de 100644 --- a/docs/handbook/en/html/hdbk-op-bookshelfmanager.html +++ b/docs/handbook/en/html/hdbk-op-bookshelfmanager.html @@ -1,4 +1,4 @@ -The Bookshelf Manager

Hoofdstuk 4. BibleTime configureren

Inhoudsopgave

Configure BibleTime Dialog
+Hoofdstuk 4. BibleTime configureren

Hoofdstuk 4. BibleTime configureren

In this section you find an overview to configure BibleTime, which can be found under Settings in the main menu.

Configure BibleTime Dialog

The BibleTime user interface can be customized in many ways depending on your needs. You can access the configuration dialog by selecting @@ -16,7 +16,16 @@ your needs. You can access the configuration dialog by selecting keuze uit de volgende opties:

  • Toon opstartlogo

Display templates define the rendering of text (colors, size etc.). Various built-in templates are available. If you select one, you will see a preview -on the right pane.

+on the right pane.

+ Desk +

Many features provided by the Sword backend can now be customized in +BibleTime. These features are documented right in the dialog. You also +have the possibility to specify standard works that should be used when no +specific work is specified in a reference. An example: The standard Bible +is used to display the content of cross references in the Bible. When you +hover over them, the Mag will show the content of the verses referred to, +according to the standard Bible you specified. With the use of text +filters, you can control the appearance of the text.

Languages

Hier kunt u specificeren welke talen gebruikt moeten worden voor de bijbelboeknamen. Stel dit op uw moedertaal als deze beschikbaar is en u @@ -52,8 +61,7 @@ karakters ondersteunt. A new free Unicode font initiative. Crosswire's font directory - Verscheidene lettertypen zijn beschikbaar op de ftp pagina van de Crosswire -Bible Society. + Several fonts available from the Crosswire Bible Society FTP site. Bitstream CyberBit Dekt bijna het gehele bereik van Unicode, maar kan BibleTime vertragen @@ -65,19 +73,11 @@ en Thaise karakters. bijbehorende website.


There are good Unicode font lists on the net, as the one by Christoph Singer ( Multilingual Unicode TrueType Fonts in the Internet), or the one by Alan Wood ( Unicode character -ranges and the Unicode fonts that support them).

- Desk -

Many features provided by the Sword backend can now be customized in -BibleTime. These features are documented right in the dialog. You also -have the possibility to specify standard works that should be used when no -specific work is specified in a reference. An example: The standard Bible is -used to display the content of cross references in the Bible. When you hover -over them, the Mag will show the content of the verses referred to, -according to the standard Bible you specified.

- HotKeys -

Sneltoetsen zijn speciale toetsencombinaties die gebruikt kunnen worden in -plaats van menu items en iconen. Een aantal van BibleTime's commando's -hebben voorgeprogrammeerde sneltoetsen (zie deze sectie voor een volledige -lijst). Aan de meeste van BibleTime's commando's kunnen hier sneltoetsen -worden toegewezen. Dit is erg handig om snel toegang te hebben tot de -functies die u het meest nodig heeft.

+ranges and the Unicode fonts that support them).

+ Shortcuts +

Shortcuts (previously known as HotKeys) are special key commands that can be +used in the place of the menu items and icons. A number of BibleTime's +commands have predefined Shortcuts (see this section for a complete +listing). Most of BibleTime's commands can be assigned Shortcuts. This is +very helpful to quickly access the functions that you need the most.

In the preceding example, F2, Bible Study Howto has a secondary shortcut +defined, CTRL+2.

diff --git a/docs/handbook/nl/html/hdbk-intro.html b/docs/handbook/nl/html/hdbk-intro.html index d78f74e..60d9808 100644 --- a/docs/handbook/nl/html/hdbk-intro.html +++ b/docs/handbook/nl/html/hdbk-intro.html @@ -1,17 +1,16 @@ -Hoofdstuk 1. Introductie

Hoofdstuk 1. Introductie

About BibleTime

BibleTime is a Bible study tool with support for different types of texts +Hoofdstuk 1. Introductie

Hoofdstuk 1. Introductie

About BibleTime

BibleTime is a Bible study tool with support for different types of texts and languages. Even large amounts of works modules are easy to install and -manage. It is built on the Sword library, which provides +manage. It is built on the Sword library, which provides the back-end functionality for BibleTime, such as viewing Bible text, -searching etc. Sword is the flagship product of the Crosswire Bible Society.

BibleTime is designed to be used with works encoded in one of the formats -supported by the Sword project. Complete information on the supported +searching etc. Sword is the flagship product of the Crosswire Bible Society.

BibleTime is designed to be used with works encoded in one of the formats +supported by the Sword project. Complete information on the supported document formats can be found in the developers -section of the Sword Project, Crosswire Bible Society.

Beschikbare modules

Meer dan 200 documenten in 50 talen zijn beschikbaar bij de Crosswire Bible Society. Hierin zijn -opgenomen: +section of the Sword Project, Crosswire Bible Society.

Beschikbare modules

Over 200 documents in 50 languages are available from the Crosswire Bible Society. These include:

Bijbels

The full Bible text, with optional things like Strong's Numbers, headings and/or footnotes in the text. Bibles are available in many languages, and include not only modern versions, but also ancient texts like the Codex Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is -the most advanced section in the library of the Sword project.

Boeken

Books available include "Imitation of Christ", "Enuma Elish", and "Josephus: +the most advanced section in the library of the Sword project.

Boeken

Books available include "Imitation of Christ", "Enuma Elish", and "Josephus: The Complete Works"

Bijbelcommentaren

Commentaries available include classics like John Wesley's "Notes on the Bible", Matthew Henry's commentary and Luther's "Commentary on Galatians." With the Personal commentary you can record your own personal notes to diff --git a/docs/handbook/nl/html/hdbk-op-bookshelfmanager.html b/docs/handbook/nl/html/hdbk-op-bookshelfmanager.html index eb227bd..57601e6 100644 --- a/docs/handbook/nl/html/hdbk-op-bookshelfmanager.html +++ b/docs/handbook/nl/html/hdbk-op-bookshelfmanager.html @@ -1,4 +1,4 @@ -De Boekenplank Manager

De Boekenplank Manager

The Bookshelf Manager is a tool to manage your +De Boekenplank Manager

De Boekenplank Manager

The Bookshelf Manager is a tool to manage your Bookshelf. You can install new works to your Bookshelf, and update or remove existing works from your Bookshelf. Access it by clicking SettingsBookshelf Manager in the main menu.

Het instellen van Boekenplank bestandspad(en)

Here you can specify where BibleTime may store your Bookshelf on the hard drive. You can even store it in multiple directories. Default is @@ -7,10 +7,10 @@ disk, but use them directly from the CD, then you can add the path to the CD as one of your bookshelf paths. When you start BibleTime, it will show all works on the CD if it is present.

Modules installeren/bijwerken

With this facility, you can connect to a repository of works (called "library"), and transfer one or more works to your local Bookshelf. These -libraries may be local (e.g. a Sword CD), or remote (e.g. Crosswire's online -repository of Sword modules, or another site offering Sword modules). You -can manage your libraries with Add library and -Delete library.

Om het proces van installeren of bijwerken te starten kiest u een +libraries may be local (e.g. a Sword CD), or remote (e.g. Crosswire's +online repository of Sword modules, or another site offering Sword +modules). You can manage your libraries with Add +library and Delete library.

Om het proces van installeren of bijwerken te starten kiest u een bibliotheek waarmee u verbinding wilt zoeken en een lokaal bestandspad naar een Boekenplank om de module(s) naar toe te installeren. Klik dan op Verbinden met bibliotheek. BibleTime zal de inhoud diff --git a/docs/handbook/nl/html/hdbk-op-output.html b/docs/handbook/nl/html/hdbk-op-output.html index b9ad447..21ac946 100644 --- a/docs/handbook/nl/html/hdbk-op-output.html +++ b/docs/handbook/nl/html/hdbk-op-output.html @@ -1,4 +1,4 @@ -Exporteren en Printen

Exporteren en Printen

In many places, you can open a context menu by clicking with the +Exporteren en Printen

Exporteren en Printen

In many places, you can open a context menu by clicking with the right mouse button. Depending on context, it will allow you to Select, Copy (to clipboard), diff --git a/docs/handbook/nl/html/hdbk-op-parts.html b/docs/handbook/nl/html/hdbk-op-parts.html index 930b2dd..eefb881 100644 --- a/docs/handbook/nl/html/hdbk-op-parts.html +++ b/docs/handbook/nl/html/hdbk-op-parts.html @@ -1,4 +1,4 @@ -Onderdelen van het BibleTime toepassingsvenster

Onderdelen van het BibleTime toepassingsvenster

De Boekenplank

De Boekenplank laat alle geïnstalleerde modules zien, gesorteerd per +Onderdelen van het BibleTime toepassingsvenster

Onderdelen van het BibleTime toepassingsvenster

De Boekenplank

De Boekenplank laat alle geïnstalleerde modules zien, gesorteerd per categorie en taal. Het heeft ook een categorie genaamd "Bladwijzers". Dit is de plaats waar u uw eigen bladwijzers kunt opslaan en openen.

Modules lezen

Om een module uit de boekenplank te openen om te lezen, kunt u simpelweg met de linker muisknop klikken op de gewenste @@ -18,7 +18,7 @@ a window with lots of interesting information about the selected work. "Unlock this work" opens a small dialog for encrypted documents, where you can enter the unlock key to access the work. For additional information on locked works, please see this -page on the Crosswire Bible Society web site.

Zoeken in modules

You can search in a work by clicking with the +page on the Crosswire Bible Society web site.

Zoeken in modules

You can search in a work by clicking with the right mouse button on its symbol and selecting "Search in work(s)". By pressing Shift and clicking on other works you can select more than one. Then follow the same @@ -56,10 +56,9 @@ that you can either control the placement of the read windows completely yourself, or have BibleTime handle the placement automatically. To achieve this, you have to select one of the automatic placement modes available at WindowArrangement -mode. Just try it out, it's simple and works.

Uw eigen bijbelcommentaar bewerken

Om uw eigen commentaar over delen van de bijbel op te kunnen slaan, moet u -een bepaalde module uit de bibliotheek van de Crosswire Bible Society -installeren. Deze module heet "Personal commentary" (Persoonlijk -bijbelcommentaar).

If you open the personal commentary by clicking on its symbol in the +mode. Just try it out, it's simple and works.

Uw eigen bijbelcommentaar bewerken

To be able to store your own comments about parts of the Bible, you have +install a certain work from the library of the Crosswire Bible Society. This work is called "Personal +commentary".

If you open the personal commentary by clicking on its symbol in the Bookshelf with a left mouse button, it opens in 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 diff --git a/docs/handbook/nl/html/hdbk-op-search.html b/docs/handbook/nl/html/hdbk-op-search.html index f4f9806..10af1a6 100644 --- a/docs/handbook/nl/html/hdbk-op-search.html +++ b/docs/handbook/nl/html/hdbk-op-search.html @@ -1,8 +1,8 @@ -Zoeken in modules

Zoeken in modules

Tekst zoeken in een geopend leesvenster

You can look for a word or phrase in the open read window (e.g. the chapter +Zoeken in modules

Zoeken in modules

Tekst zoeken in een geopend leesvenster

You can look for a word or phrase in the open read window (e.g. the chapter of a bible that you're reading) just like you are used to from other programs. This function can be reached either by clicking with the right mouse button and selecting -Find..., or by using the hotkey CtrlF. Read on to learn how +Find..., or by using the shortcut CtrlF. Read on to learn how you can search in entire works.

De zoekdialoog benaderen

You can search in a work by clicking with the right mouse button on its symbol in the Bookshelf and selecting Search in @@ -17,17 +17,21 @@ multiple works, click on this button and you will be offered a menu where you can select the works you want to search in.

Zoekbereiken gebruiken

You can narrow the scope of your search to certain parts of the Bible by selecting one of the predefined scopes from the list in Search scope. You can define your own search ranges by clicking the -Setup ranges button.

Introductie op de syntaxis van een eenvoudige zoekopdracht

Enter search terms separated by spaces. By default the search function will -return results that match any of the search terms (OR). To search for all -the terms separate the terms by AND.

U kunt jokers gebruiken: '*' komt overeen met elke willekeurige reeks van -karakters, terwijl '?' overeenkomt met één willekeurig karakter. Het gebruik -van haakjes staat u toe om zoektermen te groeperen, bijv. '(Jezus OR Geest) -AND God'.

To search text other than the main text, enter the text type followed by -':', and then the search term. For example, to search for the Strong's -number H8077, use 'strong:H8077'.

Beschikbare typen tekst: -

Tabel 3.1. Search Types

VoorvoegselBetekenis
Koptekst:doorzoekt kopteksten
voetnoot:doorzoekt voetnoten
strong:doorzoekt Strong-nummering
morph:doorzoekt morfologische codes


BibleTime uses the Lucene search engine to perform your searches. It has +Setup ranges button.

Introductie op de syntaxis van een eenvoudige zoekopdracht

Enter the search phrase separated by spaces. By default the search function +will return results that match all the words. If you want to find any of +the words entered, select the Some words button. If you +want to perform a more complex search, select the Free +button. You can see examples of searches by clicking on full +syntax. +

You can use wildcards: '*' matches any number of characters, while '?' will +match any single character. The use of brackets allows you to group your +search terms, e.g. '(Jesus OR spirit) AND God'.

To search text other than the main text, enter the text type followed by +':', and then the search term. Refer to the table below for examples.

Beschikbare typen tekst: +

Tabel 3.1. Search Types

VoorvoegselBetekenisExample
Koptekst:doorzoekt koptekstenheading:Jesus
voetnoot:doorzoekt voetnotenfootnote:Moses
strong:doorzoekt Strong-nummeringstrong:G535
morph:doorzoekt morfologische codesmorph:N-GSM


Tip

You can right click on an installed work and select About +to find which of the above search criteria may work for you. Not all works +have the built in features for performing this type of search.

BibleTime uses the Lucene search engine to perform your searches. It has many advanced features, and you can read more about it here: -http://lucene.apache.org/java/docs/index.html

Zoekresultaten

Here you can see how many instances of the search string were found, sorted +http://lucene.apache.org/java/docs/index.html.

Zoekresultaten

Here you can see how many instances of the search string were found, sorted by works. Clicking on a work with the right mouse button allows you to copy, save, or print all verses that were found in a certain work at once. This also works when you click on one or more of the diff --git a/docs/handbook/nl/html/hdbk-op.html b/docs/handbook/nl/html/hdbk-op.html index 9736267..e1008df 100644 --- a/docs/handbook/nl/html/hdbk-op.html +++ b/docs/handbook/nl/html/hdbk-op.html @@ -1,4 +1,4 @@ -Hoofdstuk 3. Werking van het programma

Hoofdstuk 3. Werking van het programma

Programma overzicht

This is what a typical BibleTime session looks like: +Hoofdstuk 3. Werking van het programma

Hoofdstuk 3. Werking van het programma

Programma overzicht

This is what a typical BibleTime session looks like:

The BibleTime application window

You can easily see the different parts of the application. The top left window is used to open installed works in the Bookshelf tab, and with the diff --git a/docs/handbook/nl/html/hdbk-reference-hotkeys.html b/docs/handbook/nl/html/hdbk-reference-shortcuts.html similarity index 82% rename from docs/handbook/nl/html/hdbk-reference-hotkeys.html rename to docs/handbook/nl/html/hdbk-reference-shortcuts.html index 8847cf1..c4bac4a 100644 --- a/docs/handbook/nl/html/hdbk-reference-hotkeys.html +++ b/docs/handbook/nl/html/hdbk-reference-shortcuts.html @@ -1,8 +1,9 @@ -Sneltoetsen index

Sneltoetsen index

This is index of all hotkeys and their corresponding description in the -handbook. The hotkeys are sorted (roughly) alphabetical. If you want to -directly find out which hotkey a certain menu item has, you can either look -at the entry itself in BibleTime (as it always shows the hotkey), or you -can look it up in this section.

SneltoetsBeschrijving
+Shortcuts index

Shortcuts index

This is index of all shortcuts and their corresponding description in the +handbook. The shortcuts are sorted (roughly) alphabetical. If you want to +directly find out which shortcuts a certain menu item has, you can either +look at the entry itself in BibleTime (as it always shows the shortcut), +or you can look it up in this +section.

- Tecla de atalho + Shortcut Descrio diff --git a/docs/handbook/pt-br/docbook/hdbk-start.docbook b/docs/handbook/pt-br/docbook/hdbk-start.docbook index 0c9058e..2732102 100644 --- a/docs/handbook/pt-br/docbook/hdbk-start.docbook +++ b/docs/handbook/pt-br/docbook/hdbk-start.docbook @@ -1,7 +1,9 @@ Iniciando &bibletime; + Como iniciar o &bibletime; + Iniciando &bibletime; &bibletime; um arquivo executvel integrado ao desktop. Voc pode iniciaro @@ -14,25 +16,23 @@ cone do &bibletime; + &bibletime; pode ser iniciado de um terminal de prompt de comando. Para iniciar o &bibletime;, abra uma janela do terminal e digite: - &bibletime; - - - Outros gerenciadores de janelas - &bibletime; pode ser usado com outros gerenciadores de janelas como Gnome, -Blackbox, Fluxbox, OpenBox ou Sawfish, contanto que as bibliotecas base -apropriadas j estejam instaladas no seu computador. + bibletime + Personalizao de incio De um terminal voc pode usar o &bibletime; para abrir um versculo aleatrio -na bblia padro: - bibletime --open-default-bible - "<random>"Para abrir numa passagem como Joo 3:16, use: - bibletime --open-default-bible "Joo 3:16"Voc tambm pode usar os nomes dos livros em seu idioma de nomes atual. +na bblia padro: + bibletime --open-default-bible "<random>" + Para abrir numa passagem como Joo 3:16, use: + bibletime --open-default-bible "Joo 3:16" + Voc tambm pode usar os nomes dos livros em seu idioma de nomes atual. + Sequncia de incio Ao iniciar o &bibletime;, voc pode ver as seguintes telas antes da janela diff --git a/docs/handbook/pt-br/docbook/index.docbook b/docs/handbook/pt-br/docbook/index.docbook index 636eade..9348385 100644 --- a/docs/handbook/pt-br/docbook/index.docbook +++ b/docs/handbook/pt-br/docbook/index.docbook @@ -4,6 +4,7 @@ [ BibleTime'> Sword'> + Crosswire Bible Society'> KDE'> Qt'> @@ -47,13 +48,13 @@ O livro de mo do &bibletime; parte do &bibletime;. - 2009-09 - 2.3 + 2009-10 + 2.4 - &bibletime; uma ferramenta de estudo da Bblia baseado no framework Sword. + &bibletime; is a Bible study tool based on the &sword; framework. - QT4 + Qt4 bibletime sword crosswire diff --git a/docs/handbook/pt-br/html/hdbk-config.html b/docs/handbook/pt-br/html/hdbk-config.html index 406a77f..198646d 100644 --- a/docs/handbook/pt-br/html/hdbk-config.html +++ b/docs/handbook/pt-br/html/hdbk-config.html @@ -1,11 +1,11 @@ -Capítulo 4. Configurando BibleTime
ShortcutBeschrijving
AltLeft Gaat terug in de history van leesvensters
AltRight diff --git a/docs/handbook/nl/html/hdbk-reference-toolbar.html b/docs/handbook/nl/html/hdbk-reference-toolbar.html deleted file mode 100644 index ba16ab8..0000000 --- a/docs/handbook/nl/html/hdbk-reference-toolbar.html +++ /dev/null @@ -1,10 +0,0 @@ -Werkbalk verwijzingen

Werkbalk verwijzingen

Bekijk de vorige sectie voor een -uitleg over de knoppen die u vindt op de werkbalk. U kunt ook de -muisaanwijzer over een knop bewegen en enkele seconden wachten om -de tooltip met een korte beschrijving van een knop op te roepen.

U kunt de werkbalk aanpassen naar uw behoeften. Gebruik het volgende item in -het hoofdmenu: -

- - SettingsConfigure toolbars -

Werkbalken configureren

Please see this -section for detailed instructions.

diff --git a/docs/handbook/nl/html/hdbk-reference-works.html b/docs/handbook/nl/html/hdbk-reference-works.html index 9363a0f..a6a0cc9 100644 --- a/docs/handbook/nl/html/hdbk-reference-works.html +++ b/docs/handbook/nl/html/hdbk-reference-works.html @@ -1,4 +1,4 @@ -Works reference

Works reference

+Works reference

Works reference

In this section you can find descriptions of the icons associated with open works.

@@ -85,4 +85,4 @@ works.

Select an additional glossary or devotional.

-

+

diff --git a/docs/handbook/nl/html/hdbk-reference.html b/docs/handbook/nl/html/hdbk-reference.html index 9d881ce..b0af377 100644 --- a/docs/handbook/nl/html/hdbk-reference.html +++ b/docs/handbook/nl/html/hdbk-reference.html @@ -1,4 +1,4 @@ -Hoofdstuk 5. Verwijzing

Hoofdstuk 5. Verwijzing

Inhoudsopgave

Hoofdmenu verwijzing
+Hoofdstuk 5. Verwijzing

Hoofdstuk 5. Verwijzing

Hoofdmenu verwijzing

In deze sectie kunt u gedetailleerde beschrijvingen vinden van alle items in -het hoofdmenu van BibleTime. Ze zijn in precies dezelfde volgorde -gerangschikt als ze voorkomen in BibleTime, met alle sub-items genoemd -onder het hoofd-item waartoe ze behoren. U kunt ook de sneltoets voor elk -item zien; een complete lijst van alle sneltoetsen kunt u vinden in deze sectie.

+

Works reference
Shortcuts index

Hoofdmenu verwijzing

In this section you can find detailed descriptions of all entries in the +main menu of BibleTime. They are ordered in just the way they appear in +BibleTime, with all the sub-items listed under the major menu item they +belong to. You can also see the shortcut of each item;a complete listing of +all shortcuts can be found in this +section.

Help

diff --git a/docs/handbook/nl/html/hdbk-startsequence.html b/docs/handbook/nl/html/hdbk-startsequence.html index eeb3d27..b91872a 100644 --- a/docs/handbook/nl/html/hdbk-startsequence.html +++ b/docs/handbook/nl/html/hdbk-startsequence.html @@ -1,4 +1,4 @@ -Volgorde van opstartschermen

Volgorde van opstartschermen

Wanneer BibleTime opstart kun je de volgende schermen zien, voordat het +Volgorde van opstartschermen

Volgorde van opstartschermen

Wanneer BibleTime opstart kun je de volgende schermen zien, voordat het hoofdvenster van BibleTime opent:

Bookshelf Manager

diff --git a/docs/handbook/nl/html/hdbk-term.html b/docs/handbook/nl/html/hdbk-term.html index a3c19ed..dc2c80a 100644 --- a/docs/handbook/nl/html/hdbk-term.html +++ b/docs/handbook/nl/html/hdbk-term.html @@ -1,11 +1,10 @@ -Hoofdstuk 2. BibleTime opstarten

Hoofdstuk 2. BibleTime opstarten

Hoe u BibleTime opstart

BibleTime opstarten

BibleTime is an executable file that is integrated with the desktop. You +Hoofdstuk 2. BibleTime opstarten

Hoofdstuk 2. BibleTime opstarten

Hoe u BibleTime opstart

BibleTime opstarten

BibleTime is an executable file that is integrated with the desktop. You can launch BibleTime from the Start Menu with this icon:

BibleTime start icon

BibleTime can also be launched from a terminal command prompt. To launch BibleTime, open a terminal window and type: -

BibleTime

Andere window managers

BibleTime can be used with other window managers such as Gnome, BlackBox, -Fluxbox, OpenBox or Sawfish, providing the appropriate base libraries are -already installed on your computer.

Aanpassing van het opstarten

From a terminal you can use BibleTime to open a random verse in the -default bible: -

bibletime --open-default-bible
-      "<random>"

To open at a given passage like John 3:16, use: -

bibletime --open-default-bible "John 3:16"

You can also use booknames in your current bookname language.

+

bibletime

Aanpassing van het opstarten

From a terminal you can use BibleTime to open a random verse in the +default bible: +

bibletime --open-default-bible "<random>"

+ To open at a given passage like John 3:16, use: +

bibletime --open-default-bible "John 3:16"

+ You can also use booknames in your current bookname language.

diff --git a/docs/handbook/nl/html/index.html b/docs/handbook/nl/html/index.html index 17f1015..fe71c41 100644 --- a/docs/handbook/nl/html/index.html +++ b/docs/handbook/nl/html/index.html @@ -1,11 +1,11 @@ -Het BibleTime handboek

Het BibleTime handboek

Fred Saalbach

Jeffrey Hoyt

Martin Gruner

Thomas Abthorpe

2.3

Het BibleTime handboek is onderdeel van BibleTime

Samenvatting

BibleTime is a Bible study tool based on the Sword framework.


Inhoudsopgave

1. Introductie
About BibleTime
Beschikbare modules
Motivatie
2. BibleTime opstarten
Hoe u BibleTime opstart
BibleTime opstarten
Andere window managers
Aanpassing van het opstarten
Volgorde van opstartschermen
3. Werking van het programma
Programma overzicht
Onderdelen van het BibleTime toepassingsvenster
De Boekenplank
Het Vergrootglas
Het Bureau
Zoeken in modules
Tekst zoeken in een geopend leesvenster
De zoekdialoog benaderen
Configuratie van de zoekopdracht
Zoekresultaten
De Boekenplank Manager
Het instellen van Boekenplank bestandspad(en)
Modules installeren/bijwerken
Module(s) verwijderen
Search Indexes
Exporteren en Printen
4. BibleTime configureren
Configure BibleTime Dialog
+Het BibleTime handboek +
Works reference
Shortcuts index

Lijst van tabellen

3.1. Search Types
4.1. Unicode lettertypen
diff --git a/docs/handbook/pt-br/docbook/hdbk-config.docbook b/docs/handbook/pt-br/docbook/hdbk-config.docbook index 8392637..30fda22 100644 --- a/docs/handbook/pt-br/docbook/hdbk-config.docbook +++ b/docs/handbook/pt-br/docbook/hdbk-config.docbook @@ -8,6 +8,7 @@ que pode ser encontrado em Configuraes no menu principal.Configuraes Configurar &bibletime;. + <guimenu>Display</guimenu> @@ -23,6 +24,21 @@ opes: modelos internos disponveis. Se voc escolher um, ir ver uma pr-visualizao no painel direito.</para> </sect2> + + <sect2 id="hdbk-config-bt-desk"> + <title> + <guimenu>Desk</guimenu> + + Many features provided by the &sword; backend can now be customized in +&bibletime;. These features are documented right in the dialog. You also +have the possibility to specify standard works that should be used when no +specific work is specified in a reference. An example: The standard Bible +is used to display the content of cross references in the Bible. When you +hover over them, the Mag will show the content of the verses referred to, +according to the standard Bible you specified. With the use of text +filters, you can control the appearance of the text. + + <guimenu>Languages</guimenu> @@ -125,7 +141,8 @@ caracteres.</entry> <ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS"> Crosswire's font directory</ulink> </entry> - <entry>Vrias fontes disponveis do site Ftp da Crosswire Bible Society.</entry> + + <entry>Several fonts available from the &cbs; FTP site.</entry> </row> <row> <entry> @@ -156,29 +173,25 @@ url="http://www.alanwood.net/unicode/fontsbyrange.html">Faixas de caracteres Unicode e fontes Unicodes que as suportam</ulink>).</para> </sect3> </sect2> - <sect2 id="hdbk-config-bt-desk"> - <title> - <guimenu>Desk</guimenu> - - Muitos recursos providos pelo backend do Sword podem agora ser -personalizados no &bibletime;. Esses recursos esto documentados no prprio -dilogo. Voc tambm tem a possibilidade de especificar obras padres que devem -ser usadas quando nenhuma obra em particular especificada numa -referncia. Um exemplo: a Bblia padro usada para mostrar o contedo de -referncias cruzadas na Bblia. Quando voc passar por cima delas, a lupa vai -mostrar o contedo dos vesculos referidos, de acordo com a Bblia padro que -voc especificou. - - + + - <guimenu>HotKeys</guimenu> + <guimenu>Shortcuts</guimenu> - Teclas de atalho so comandos de tecla especiais que podem ser usados no -lugar de itens de menu e cones. Vrios comandos do &bibletime; tm teclas de -atalho pr-definidas (veja esta -seo para uma listagem completa). A maior parte dos comandos do -&bibletime; pode ser associado a teclas de atalho aqui. Isso muito til para -acessar rapidamente as funes que voc mais usa. + + Shortcuts (previously known as HotKeys) are special key commands that can be +used in the place of the menu items and icons. A number of &bibletime;'s +commands have predefined Shortcuts (see this section for a complete +listing). Most of &bibletime;'s commands can be assigned Shortcuts. This is +very helpful to quickly access the functions that you need the most. + + + + + + In the preceding example, F2, Bible Study Howto has a secondary shortcut +defined, CTRL+2. diff --git a/docs/handbook/pt-br/docbook/hdbk-intro.docbook b/docs/handbook/pt-br/docbook/hdbk-intro.docbook index bfd36f9..c6b1482 100644 --- a/docs/handbook/pt-br/docbook/hdbk-intro.docbook +++ b/docs/handbook/pt-br/docbook/hdbk-intro.docbook @@ -2,34 +2,34 @@ Introduo Sobre &bibletime; - &bibletime; uma ferramenta de estudo bblico com suporte para diferentes -tipos de textos e idiomas. Mesmo grandes quantidades de obras so simples de -instalar e gerenciar. Ele foi feito sobre a biblioteca Sword, que prov a -funcionalidade de back-end para o &bibletime;, tal como visualizar texto -bblico, pesquisar, etc. Sword o carro-chefe da Crosswire Bible Society. - &bibletime; foi desenhado para ser usado com obras codificadas em um dos -formatos suportados pelo projeto Sword. Informaes completas sobre os -formatos de documentos suportados podem ser encontradas na seo -dedesenvolvimento do Projeto Sword, Crosswire Bible Society. + &bibletime; is a Bible study tool with support for different types of texts +and languages. Even large amounts of works modules are easy to install and +manage. It is built on the &sword; library, which provides +the back-end functionality for &bibletime;, such as viewing Bible text, +searching etc. &sword; is the flagship product of the &cbs;. + + &bibletime; is designed to be used with works encoded in one of the formats +supported by the &sword; project. Complete information on the supported +document formats can be found in the developers +section of the &sword; Project, &cbs;. Obras disponveis - Mais de 200 documentos em 50 idiomas esto disponveis da Crosswire Bible Society. Esto -inclusos: + Over 200 documents in 50 languages are available from the &cbs;. These include: Bblias - O texto completo da Bblia, com itens opcionais como os nmeros Strong, -cabealhos e/ou rodaps no texto. Bblias esto disponveis em muitos idiomas, e -incluem no somente verses modernas, mas tambm textos antigos como o Codex -Leningradensis ("WLC", hebraico), e a Septuaginta ("LXX", grego). Essa a -seo mais avanada na biblioteca do projeto Sword. + The full Bible text, with optional things like Strong's Numbers, headings +and/or footnotes in the text. Bibles are available in many languages, and +include not only modern versions, but also ancient texts like the Codex +Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is +the most advanced section in the library of the &sword; project. diff --git a/docs/handbook/pt-br/docbook/hdbk-operation.docbook b/docs/handbook/pt-br/docbook/hdbk-operation.docbook index 9e04036..9a25b39 100644 --- a/docs/handbook/pt-br/docbook/hdbk-operation.docbook +++ b/docs/handbook/pt-br/docbook/hdbk-operation.docbook @@ -53,15 +53,15 @@ ele vai para o local desejado. Informao adicional sobre obras - Se voc clicar com o boto direito do mouse -nosmbolo de uma obra, voc ver um menu com opes adicionais relevantes para -essa obra. "Sobre essa obra" abre uma janela com -vrias informaes interessantes sobre a obra -selecionada. "Destravar essa obra" abre um -pequeno dilogo para documentos criptografados, onde voc pode colocar a chave -de liberao para acessar a obra. Para mais informaes sobre obras travadas, -veja -essa pgina no site da Crosswire Bible Society. + If you click with the right mouse button on the +symbol of a work, you will see a menu with additional entries that are +relevant for this work. "About this work" opens +a window with lots of interesting information about the selected work. +"Unlock this work" opens a small dialog for +encrypted documents, where you can enter the unlock key to access the +work. For additional information on locked works, please see this +page on the &cbs; web site. @@ -141,10 +141,11 @@ um dos modos de posicionamento automtico disponveis em Editando seu prprio comentrio - Para poder armazenar seus prprios comentrios sobre partes da Bblia, voc -precisa instalar uma certa obra da biblioteca da Crosswire Bible Society. Essa obra -chama-se "Comentrio pessoal". + + To be able to store your own comments about parts of the Bible, you have +install a certain work from the library of the &cbs;. This work is called "Personal +commentary". Se voc abrir o comentrio pessoal clicando no seu smbolo na Estante com o boto esquerdo do mouse, ele abre em modo de @@ -173,13 +174,13 @@ versculo ser inserido. Procurando texto em uma janela de leitura aberta - Voc pode procurar uma palavra ou frase na janela de leitura aberta (ex. o -captulo da bblia que estiver lendo) da mesma maneira que est acostumado em -outros programas. Isso pode ser feito clicando com o boto -direito do mouse e selecionando -Procurar..., ou usando a tecla de atalho &Ctrl;F. Continue lendo para -aprender como voc pode procura em obras inteiras. + You can look for a word or phrase in the open read window (e.g. the chapter +of a bible that you're reading) just like you are used to from other +programs. This function can be reached either by clicking with the +right mouse button and selecting +Find..., or by using the shortcut &Ctrl;F. Read on to learn how +you can search in entire works. @@ -224,53 +225,74 @@ selecionando um dos escopos pr-definidos da lista em Escopo de busca. Voc pode definir suas prprias faixas de busca clicando no boto Configurar faixas. + Introduo Sintaxe Bsica de Busca - Coloque os termos de busca separados por espaos. Por padro, a funo de busca -vai retornar resultados que coincidam com qualquer um dos termos de busca -(OR). Para buscar por todos os termos, separe-os por AND. - Voc pode usar caracteres curinga: '*' coincide com qualquer sequncia de -caracteres, enquanto '?' coincide com um nico caractere qualquer. O uso de -parnteses permite agrupar termos de busca, por exemplo '(Jesus OR esprito) -AND Deus'. - Para buscar texto que no seja o texto principal, entre com o tipo de texto -seguido de ':', e ento o termo de busca. Por exemplo, para procurar pelo -nmero Strong H8077, use 'strong:H8077'. + + Enter the search phrase separated by spaces. By default the search function +will return results that match all the words. If you want to find any of +the words entered, select the Some words button. If you +want to perform a more complex search, select the Free +button. You can see examples of searches by clicking on full +syntax. + + + You can use wildcards: '*' matches any number of characters, while '?' will +match any single character. The use of brackets allows you to group your +search terms, e.g. '(Jesus OR spirit) AND God'. + + To search text other than the main text, enter the text type followed by +':', and then the search term. Refer to the table below for examples. + Tipos de texto disponveis: Tipos de Busca - + Prefixo Significado + Example heading: busca em cabealhos + heading:Jesus footnote: busca em rodaps + footnote:Moses strong: busca em Nmeros Strong + strong:G535 morph: busca em cdigos morfolgicos + morph:N-GSM
- &bibletime; usa o mdulo de busca da Lucene para realizar suas buscas. Ele -tem muitos recursos avanados, e voc pode ler mais sobre ele aqui: http://lucene.apache.org/java/docs/index.html + + + You can right click on an installed work and select About +to find which of the above search criteria may work for you. Not all works +have the built in features for performing this type of search. + + + &bibletime; uses the Lucene search engine to perform your searches. It has +many advanced features, and you can read more about it here: +http://lucene.apache.org/java/docs/index.html.
+ Resultados de busca Aqui voc pode ver quantas instncias do termo de busca foram encontradas, @@ -329,12 +351,12 @@ para o CD como um dos caminhos da sua estante. Quando voc iniciar o Instalar/atualizar obra(s) - Com esse recurso, voc pode conectar a um repositrio de obras (chamado -"biblioteca"), e transferir uma ou mais obras para sua Estante local. Essas -bibliotecas podem ser locais (e.g. um CD do Sword), ou remota (e.g. o -repositrio online da Crosswire de mdulos Sword, ou outro site oferecendo -mdulos Sword). Voc pode gerenciar suas bibliotecas com Adicionar -biblioteca e Excluir biblioteca. + With this facility, you can connect to a repository of works (called +"library"), and transfer one or more works to your local Bookshelf. These +libraries may be local (e.g. a &sword; CD), or remote (e.g. Crosswire's +online repository of &sword; modules, or another site offering &sword; +modules). You can manage your libraries with Add +library and Delete library. Para comear o processo de instalao ou atualizao, selecione uma biblioteca qual voc queira conectar e um caminho de Estante local para instalar a(s) obra(s). Ento clique em Conectar diff --git a/docs/handbook/pt-br/docbook/hdbk-reference.docbook b/docs/handbook/pt-br/docbook/hdbk-reference.docbook index 8132bbb..cea402f 100644 --- a/docs/handbook/pt-br/docbook/hdbk-reference.docbook +++ b/docs/handbook/pt-br/docbook/hdbk-reference.docbook @@ -2,12 +2,12 @@ Referncia Referncia do menu principal - Nessa seo voc pode encontrar descries detalhadas de todos os itens do menu -principal do &bibletime;. Eles so apresentados na mesma ordem em que -aparecem no &bibletime;, com todos os sub-itens listados sob o item ao qual -eles pertencem. Voc tambm pode ver a tecla de atalho para cada item; uma -listagem completa de todas as teclas de atalho pode ser encontrada nessa seo. + In this section you can find detailed descriptions of all entries in the +main menu of &bibletime;. They are ordered in just the way they appear in +&bibletime;, with all the sub-items listed under the major menu item they +belong to. You can also see the shortcut of each item;a complete listing of +all shortcuts can be found in this +section. <guimenu>File</guimenu> @@ -425,9 +425,9 @@ seo</link> para detalhes.</para> </term> <listitem> <para> - <action>Abre um dilogo onde voc pode mudar sua configurao do Sword e -gerenciar sua Estante</action>. Por favor veja <link -linkend="hdbk-op-bookshelfmanager">essa seo</link> para detalhes.</para> + <action>Opens a dialog where you can change your &sword; configuration and +manage your bookshelf</action>. Please see <link +linkend="hdbk-op-bookshelfmanager">this section</link> for details.</para> </listitem> </varlistentry> </variablelist> @@ -795,21 +795,21 @@ works. </sect2> </sect1> - <sect1 id="hdbk-reference-hotkeys"> - <title>ndice de teclas de atalho - Esse o ndice de todas as teclas de atalho e suas descries correspondentes -no livro de mo. As teclas de atalho esto ordenadas (mais ou menos) -alfabeticamente. Se voc deseja encontrar diretamente qual tecla de atalho um -menu tem, voc pode olhar no item em si no &bibletime; (pois ele sempre -mostra a tecla de atalho), ou voc pode olhar nessa seo. + + Shortcuts index + This is index of all shortcuts and their corresponding description in the +handbook. The shortcuts are sorted (roughly) alphabetical. If you want to +directly find out which shortcuts a certain menu item has, you can either +look at the entry itself in &bibletime; (as it always shows the shortcut), +or you can look it up in this +section. - +
Capítulo 4. Configurando BibleTime
Anterior   Próxima

Capítulo 4. Configurando BibleTime

Índice

Dilogo de configurao do BibleTime
+Capítulo 4. Configurando BibleTime

Capítulo 4. Configurando BibleTime

Nessa seo voc vai encontrar uma viso geral de como configurar o BibleTime, que pode ser encontrado em Configuraes no menu principal.

Dilogo de configurao do BibleTime

A interface de usurio do BibleTime pode ser personalizada de vrias maneiras, dependendo das suas necessidades. Voc pode acessar o dilogo de @@ -15,7 +15,16 @@ configurao selecionando Configuraes

  • Mostrar logo de inicializao

Modelos de exibio definem o estilo do texto (cores, tamanho, etc.). H vrios modelos internos disponveis. Se voc escolher um, ir ver uma pr-visualizao no -painel direito.

+painel direito.

+ Desk +

Many features provided by the Sword backend can now be customized in +BibleTime. These features are documented right in the dialog. You also +have the possibility to specify standard works that should be used when no +specific work is specified in a reference. An example: The standard Bible +is used to display the content of cross references in the Bible. When you +hover over them, the Mag will show the content of the verses referred to, +according to the standard Bible you specified. With the use of text +filters, you can control the appearance of the text.

Languages

Aqui voc pode especificar que idioma deve ser usado para os livros bblicos. Deixe-o no seu idioma nativo, se disponvel, e voc se sentir em @@ -50,7 +59,7 @@ caracteres.

Uma nova iniciativa de fonte Unicode gratuita.
Crosswire's font directory - Vrias fontes disponveis do site Ftp da Crosswire Bible Society.
+ Several fonts available from the Crosswire Bible Society FTP site.
Bitstream CyberBit Cobre quase toda a gama do Unicode, mas pode fazer o BibleTime ficar lento @@ -60,20 +69,11 @@ por causa do seu tamanho.
ClearlyuIncluda em algumas d Cobertura parcial, ver informaes no site linkado.

Existem boas listas de fontes Unicode na net, como a feita por Christoph Singer (Fontes TrueType UnicodeMulti-idiomas na Internet), ou a por Alan Wood (Faixas de caracteres -Unicode e fontes Unicodes que as suportam).

- Desk -

Muitos recursos providos pelo backend do Sword podem agora ser -personalizados no BibleTime. Esses recursos esto documentados no prprio -dilogo. Voc tambm tem a possibilidade de especificar obras padres que devem -ser usadas quando nenhuma obra em particular especificada numa -referncia. Um exemplo: a Bblia padro usada para mostrar o contedo de -referncias cruzadas na Bblia. Quando voc passar por cima delas, a lupa vai -mostrar o contedo dos vesculos referidos, de acordo com a Bblia padro que -voc especificou.

- HotKeys -

Teclas de atalho so comandos de tecla especiais que podem ser usados no -lugar de itens de menu e cones. Vrios comandos do BibleTime tm teclas de -atalho pr-definidas (veja esta -seo para uma listagem completa). A maior parte dos comandos do -BibleTime pode ser associado a teclas de atalho aqui. Isso muito til para -acessar rapidamente as funes que voc mais usa.

+Unicode e fontes Unicodes que as suportam).

+ Shortcuts +

Shortcuts (previously known as HotKeys) are special key commands that can be +used in the place of the menu items and icons. A number of BibleTime's +commands have predefined Shortcuts (see this section for a complete +listing). Most of BibleTime's commands can be assigned Shortcuts. This is +very helpful to quickly access the functions that you need the most.

In the preceding example, F2, Bible Study Howto has a secondary shortcut +defined, CTRL+2.

diff --git a/docs/handbook/pt-br/html/hdbk-intro.html b/docs/handbook/pt-br/html/hdbk-intro.html index 1134517..5446301 100644 --- a/docs/handbook/pt-br/html/hdbk-intro.html +++ b/docs/handbook/pt-br/html/hdbk-intro.html @@ -1,17 +1,16 @@ -Capítulo 1. Introduo

Capítulo 1. Introduo

Sobre BibleTime

BibleTime uma ferramenta de estudo bblico com suporte para diferentes -tipos de textos e idiomas. Mesmo grandes quantidades de obras so simples de -instalar e gerenciar. Ele foi feito sobre a biblioteca Sword, que prov a -funcionalidade de back-end para o BibleTime, tal como visualizar texto -bblico, pesquisar, etc. Sword o carro-chefe da Crosswire Bible Society.

BibleTime foi desenhado para ser usado com obras codificadas em um dos -formatos suportados pelo projeto Sword. Informaes completas sobre os -formatos de documentos suportados podem ser encontradas na seo -dedesenvolvimento do Projeto Sword, Crosswire Bible Society.

Obras disponveis

Mais de 200 documentos em 50 idiomas esto disponveis da Crosswire Bible Society. Esto -inclusos: -

Bblias

O texto completo da Bblia, com itens opcionais como os nmeros Strong, -cabealhos e/ou rodaps no texto. Bblias esto disponveis em muitos idiomas, e -incluem no somente verses modernas, mas tambm textos antigos como o Codex -Leningradensis ("WLC", hebraico), e a Septuaginta ("LXX", grego). Essa a -seo mais avanada na biblioteca do projeto Sword.

Livros

Livros disponveis incluindo "Imitation of Christ", "Enuma Elish", e +Capítulo 1. Introduo

Capítulo 1. Introduo

Sobre BibleTime

BibleTime is a Bible study tool with support for different types of texts +and languages. Even large amounts of works modules are easy to install and +manage. It is built on the Sword library, which provides +the back-end functionality for BibleTime, such as viewing Bible text, +searching etc. Sword is the flagship product of the Crosswire Bible Society.

BibleTime is designed to be used with works encoded in one of the formats +supported by the Sword project. Complete information on the supported +document formats can be found in the developers +section of the Sword Project, Crosswire Bible Society.

Obras disponveis

Over 200 documents in 50 languages are available from the Crosswire Bible Society. These include: +

Bblias

The full Bible text, with optional things like Strong's Numbers, headings +and/or footnotes in the text. Bibles are available in many languages, and +include not only modern versions, but also ancient texts like the Codex +Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is +the most advanced section in the library of the Sword project.

Livros

Livros disponveis incluindo "Imitation of Christ", "Enuma Elish", e "Josephus: The Complete Works" (em ingls)

Comentrios

Comentrios disponveis incluindo clssicos como "Notas sobre a Bblia" de John Wesley, o comentrio de Matthew Henry e o "Comentrio sobre Glatas" de Lutero. Com o comentrio pessoal voc pode gravar suas prprias notas pessoas diff --git a/docs/handbook/pt-br/html/hdbk-op-bookshelfmanager.html b/docs/handbook/pt-br/html/hdbk-op-bookshelfmanager.html index f65fea7..e276336 100644 --- a/docs/handbook/pt-br/html/hdbk-op-bookshelfmanager.html +++ b/docs/handbook/pt-br/html/hdbk-op-bookshelfmanager.html @@ -1,4 +1,4 @@ -O Gerenciador da Estante

O Gerenciador da Estante

O Gerenciador da Estante uma ferramenta para +O Gerenciador da Estante

O Gerenciador da Estante

O Gerenciador da Estante uma ferramenta para gerenciar sua Estante. Voc pode instalar novas obras em sua Estante, e atualizar ou remover obras existentes da sua Estante. Acesse-o clicando em ConfiguraesGerenciador da @@ -7,12 +7,12 @@ disco rdigo. Voc pode at armazenar em mltiplos diretrios. O padro "~/.sword/".

Dica

Se voc tem um CD do Sword, mas no quer instalar todas as obras no disco rgido, e sim us-las diretamente do CD, ento voc pode adicionar o caminho para o CD como um dos caminhos da sua estante. Quando voc iniciar o -BibleTime, ele mostrar todas as obras no CD se estiver presente.

Instalar/atualizar obra(s)

Com esse recurso, voc pode conectar a um repositrio de obras (chamado -"biblioteca"), e transferir uma ou mais obras para sua Estante local. Essas -bibliotecas podem ser locais (e.g. um CD do Sword), ou remota (e.g. o -repositrio online da Crosswire de mdulos Sword, ou outro site oferecendo -mdulos Sword). Voc pode gerenciar suas bibliotecas com Adicionar -biblioteca e Excluir biblioteca.

Para comear o processo de instalao ou atualizao, selecione uma biblioteca +BibleTime, ele mostrar todas as obras no CD se estiver presente.

Instalar/atualizar obra(s)

With this facility, you can connect to a repository of works (called +"library"), and transfer one or more works to your local Bookshelf. These +libraries may be local (e.g. a Sword CD), or remote (e.g. Crosswire's +online repository of Sword modules, or another site offering Sword +modules). You can manage your libraries with Add +library and Delete library.

Para comear o processo de instalao ou atualizao, selecione uma biblioteca qual voc queira conectar e um caminho de Estante local para instalar a(s) obra(s). Ento clique em Conectar biblioteca. BibleTime ir varrer o contedo da biblioteca e diff --git a/docs/handbook/pt-br/html/hdbk-op-output.html b/docs/handbook/pt-br/html/hdbk-op-output.html index f85529b..3d62b3f 100644 --- a/docs/handbook/pt-br/html/hdbk-op-output.html +++ b/docs/handbook/pt-br/html/hdbk-op-output.html @@ -1,4 +1,4 @@ -Exportando e Imprimindo

Exportando e Imprimindo

Em muitos lugares, voc pode abrir um menu de contexto clicando com o boto +Exportando e Imprimindo

Exportando e Imprimindo

Em muitos lugares, voc pode abrir um menu de contexto clicando com o boto direito do mouse. Dependendo do contexto, ele permitir a voc Selecionar, Copiar (para a rea de transferncia), diff --git a/docs/handbook/pt-br/html/hdbk-op-parts.html b/docs/handbook/pt-br/html/hdbk-op-parts.html index 4a8eba1..3def571 100644 --- a/docs/handbook/pt-br/html/hdbk-op-parts.html +++ b/docs/handbook/pt-br/html/hdbk-op-parts.html @@ -1,4 +1,4 @@ -Partes da janela de aplicao do BibleTime

Partes da janela de aplicao do BibleTime

A Estante de Livros

A Estante de Livros lista todas as obras instaladas, classificadas por +Partes da janela de aplicao do BibleTime

Partes da janela de aplicao do BibleTime

A Estante de Livros

A Estante de Livros lista todas as obras instaladas, classificadas por categoria e idioma. Ela tambm tem uma categoria chamada "Marcadores". Aqui onde voc pode armazenar e acessar seus prprios marcadores.

Lendo obras

Para abrir uma obra da estante para leitura, simplesmente clique com o boto esquerdo do mouse na categoria desejada @@ -10,15 +10,14 @@ esquerdo do mouse na referncia do versculo/passagem (o cursor muda para uma mo) e arraste-o para a Estante. Solte-o na obra que voc quer abrir, e ele ser aberto pra leitura no local especificado. Voc tambm pode arrastar uma referncia de versculo para uma janela de leitura j existente, e -ele vai para o local desejado.

Informao adicional sobre obras

Se voc clicar com o boto direito do mouse -nosmbolo de uma obra, voc ver um menu com opes adicionais relevantes para -essa obra. "Sobre essa obra" abre uma janela com -vrias informaes interessantes sobre a obra -selecionada. "Destravar essa obra" abre um -pequeno dilogo para documentos criptografados, onde voc pode colocar a chave -de liberao para acessar a obra. Para mais informaes sobre obras travadas, -veja -essa pgina no site da Crosswire Bible Society.

Buscando em obras

Voc pode buscar numa obra clicando com o boto +ele vai para o local desejado.

Informao adicional sobre obras

If you click with the right mouse button on the +symbol of a work, you will see a menu with additional entries that are +relevant for this work. "About this work" opens +a window with lots of interesting information about the selected work. +"Unlock this work" opens a small dialog for +encrypted documents, where you can enter the unlock key to access the +work. For additional information on locked works, please see this +page on the Crosswire Bible Society web site.

Buscando em obras

Voc pode buscar numa obra clicando com o boto direito do mouse no seu smbolo e selecionando "Buscar em obra(s)". Pressionando Shift eclicando em outras obras, voc pode selecionar mais de uma. Ento siga o @@ -54,9 +53,9 @@ de posicionar as janelas de leitura na mesa. Por favor, veja o item Janela no menu principal. Ali voc pode ver que voc pode tanto controlar o posicionamento das janelas de leitura voc mesmo, ou fazer com que o BibleTime faa isso por voc. Para fazer isso, voc deve selecionar -um dos modos de posicionamento automtico disponveis emJanelaModo de posicionamento. Experimente, simples e funciona.

Editando seu prprio comentrio

Para poder armazenar seus prprios comentrios sobre partes da Bblia, voc -precisa instalar uma certa obra da biblioteca da Crosswire Bible Society. Essa obra -chama-se "Comentrio pessoal".

Se voc abrir o comentrio pessoal clicando no seu smbolo na Estante com o +um dos modos de posicionamento automtico disponveis emJanelaModo de posicionamento. Experimente, simples e funciona.

Editando seu prprio comentrio

To be able to store your own comments about parts of the Bible, you have +install a certain work from the library of the Crosswire Bible Society. This work is called "Personal +commentary".

Se voc abrir o comentrio pessoal clicando no seu smbolo na Estante com o boto esquerdo do mouse, ele abre em modo de leitura. Voc no poder edit-lo nesse modo. Se deseja escrever anotaes no comentrio pessoal, voc deve abri-lo com o boto diff --git a/docs/handbook/pt-br/html/hdbk-op-search.html b/docs/handbook/pt-br/html/hdbk-op-search.html index 80717ef..248b3ee 100644 --- a/docs/handbook/pt-br/html/hdbk-op-search.html +++ b/docs/handbook/pt-br/html/hdbk-op-search.html @@ -1,9 +1,9 @@ -Buscando em obras

Buscando em obras

Procurando texto em uma janela de leitura aberta

Voc pode procurar uma palavra ou frase na janela de leitura aberta (ex. o -captulo da bblia que estiver lendo) da mesma maneira que est acostumado em -outros programas. Isso pode ser feito clicando com o boto -direito do mouse e selecionando -Procurar..., ou usando a tecla de atalhoCtrlF. Continue lendo para -aprender como voc pode procura em obras inteiras.

Acessando o dilogo de busca

Voc pode buscar numa obra clicando com o boto +Buscando em obras

Buscando em obras

Procurando texto em uma janela de leitura aberta

You can look for a word or phrase in the open read window (e.g. the chapter +of a bible that you're reading) just like you are used to from other +programs. This function can be reached either by clicking with the +right mouse button and selecting +Find..., or by using the shortcut CtrlF. Read on to learn how +you can search in entire works.

Acessando o dilogo de busca

Voc pode buscar numa obra clicando com o boto direito do mouse em seu smbolo na Estante e selecionando Buscar na(s)obra(s). Segurando Shift ou Ctrl e clicando em outros @@ -17,16 +17,21 @@ oferecido um menu onde voc pode selecionar as obras nas quais deseja procurar.

Usando Escopos de Busca

Voc pode restringir o escopo da sua busca a certas partes da Bblia selecionando um dos escopos pr-definidos da lista em Escopo de busca. Voc pode definir suas prprias faixas de busca clicando no -boto Configurar faixas.

Introduo Sintaxe Bsica de Busca

Coloque os termos de busca separados por espaos. Por padro, a funo de busca -vai retornar resultados que coincidam com qualquer um dos termos de busca -(OR). Para buscar por todos os termos, separe-os por AND.

Voc pode usar caracteres curinga: '*' coincide com qualquer sequncia de -caracteres, enquanto '?' coincide com um nico caractere qualquer. O uso de -parnteses permite agrupar termos de busca, por exemplo '(Jesus OR esprito) -AND Deus'.

Para buscar texto que no seja o texto principal, entre com o tipo de texto -seguido de ':', e ento o termo de busca. Por exemplo, para procurar pelo -nmero Strong H8077, use 'strong:H8077'.

Tipos de texto disponveis: -

Tabela 3.1. Tipos de Busca

PrefixoSignificado
heading:busca em cabealhos
footnote:busca em rodaps
strong:busca em Nmeros Strong
morph:busca em cdigos morfolgicos


BibleTime usa o mdulo de busca da Lucene para realizar suas buscas. Ele -tem muitos recursos avanados, e voc pode ler mais sobre ele aqui: http://lucene.apache.org/java/docs/index.html

Resultados de busca

Aqui voc pode ver quantas instncias do termo de busca foram encontradas, +boto Configurar faixas.

Introduo Sintaxe Bsica de Busca

Enter the search phrase separated by spaces. By default the search function +will return results that match all the words. If you want to find any of +the words entered, select the Some words button. If you +want to perform a more complex search, select the Free +button. You can see examples of searches by clicking on full +syntax. +

You can use wildcards: '*' matches any number of characters, while '?' will +match any single character. The use of brackets allows you to group your +search terms, e.g. '(Jesus OR spirit) AND God'.

To search text other than the main text, enter the text type followed by +':', and then the search term. Refer to the table below for examples.

Tipos de texto disponveis: +

Tabela 3.1. Tipos de Busca

PrefixoSignificadoExample
heading:busca em cabealhosheading:Jesus
footnote:busca em rodapsfootnote:Moses
strong:busca em Nmeros Strongstrong:G535
morph:busca em cdigos morfolgicosmorph:N-GSM


Dica

You can right click on an installed work and select About +to find which of the above search criteria may work for you. Not all works +have the built in features for performing this type of search.

BibleTime uses the Lucene search engine to perform your searches. It has +many advanced features, and you can read more about it here: +http://lucene.apache.org/java/docs/index.html.

Resultados de busca

Aqui voc pode ver quantas instncias do termo de busca foram encontradas, classificadas por obras. Clicando numa obra com o boto direito do mouse permite voc copiar, salvar ou imprimir todos os versculos encontrados numa obra de uma vez s. Isso tambm diff --git a/docs/handbook/pt-br/html/hdbk-op.html b/docs/handbook/pt-br/html/hdbk-op.html index 847dc17..0eb2f18 100644 --- a/docs/handbook/pt-br/html/hdbk-op.html +++ b/docs/handbook/pt-br/html/hdbk-op.html @@ -1,4 +1,4 @@ -Capítulo 3. Operao do programa

Capítulo 3. Operao do programa

Viso geral do programa

assim que parece uma tpica sesso do BibleTime: +Capítulo 3. Operao do programa

Capítulo 3. Operao do programa

Viso geral do programa

assim que parece uma tpica sesso do BibleTime:

A janela de aplicao do BibleTime

Voc pode facilmente ver diferentes partes da aplicao. A janela superior esquerda usada para abrir obras instaladas na aba Estante de Livros, e com diff --git a/docs/handbook/pt-br/html/hdbk-reference-hotkeys.html b/docs/handbook/pt-br/html/hdbk-reference-shortcuts.html similarity index 82% rename from docs/handbook/pt-br/html/hdbk-reference-hotkeys.html rename to docs/handbook/pt-br/html/hdbk-reference-shortcuts.html index 4837128..0eebfff 100644 --- a/docs/handbook/pt-br/html/hdbk-reference-hotkeys.html +++ b/docs/handbook/pt-br/html/hdbk-reference-shortcuts.html @@ -1,8 +1,9 @@ -ndice de teclas de atalho

ndice de teclas de atalho

Esse o ndice de todas as teclas de atalho e suas descries correspondentes -no livro de mo. As teclas de atalho esto ordenadas (mais ou menos) -alfabeticamente. Se voc deseja encontrar diretamente qual tecla de atalho um -menu tem, voc pode olhar no item em si no BibleTime (pois ele sempre -mostra a tecla de atalho), ou voc pode olhar nessa seo.

Tecla de atalhoDescrio
+Shortcuts index

Shortcuts index

This is index of all shortcuts and their corresponding description in the +handbook. The shortcuts are sorted (roughly) alphabetical. If you want to +directly find out which shortcuts a certain menu item has, you can either +look at the entry itself in BibleTime (as it always shows the shortcut), +or you can look it up in this +section.

ShortcutDescrio
AltLeft Volta no histrico das janelas de leitura.
AltRight diff --git a/docs/handbook/pt-br/html/hdbk-reference-works.html b/docs/handbook/pt-br/html/hdbk-reference-works.html index 564f920..876e600 100644 --- a/docs/handbook/pt-br/html/hdbk-reference-works.html +++ b/docs/handbook/pt-br/html/hdbk-reference-works.html @@ -1,4 +1,4 @@ -Works reference

Works reference

+Works reference

Works reference

In this section you can find descriptions of the icons associated with open works.

@@ -85,4 +85,4 @@ works.

Select an additional glossary or devotional.

-

+

diff --git a/docs/handbook/pt-br/html/hdbk-reference.html b/docs/handbook/pt-br/html/hdbk-reference.html index 05496f5..3af1ec9 100644 --- a/docs/handbook/pt-br/html/hdbk-reference.html +++ b/docs/handbook/pt-br/html/hdbk-reference.html @@ -1,4 +1,4 @@ -Capítulo 5. Referncia

Capítulo 5. Referncia

Índice

Referncia do menu principal
+Capítulo 5. Referncia

Capítulo 5. Referncia

Referncia do menu principal

Nessa seo voc pode encontrar descries detalhadas de todos os itens do menu -principal do BibleTime. Eles so apresentados na mesma ordem em que -aparecem no BibleTime, com todos os sub-itens listados sob o item ao qual -eles pertencem. Voc tambm pode ver a tecla de atalho para cada item; uma -listagem completa de todas as teclas de atalho pode ser encontrada nessa seo.

+

Works reference
Shortcuts index

Referncia do menu principal

In this section you can find detailed descriptions of all entries in the +main menu of BibleTime. They are ordered in just the way they appear in +BibleTime, with all the sub-items listed under the major menu item they +belong to. You can also see the shortcut of each item;a complete listing of +all shortcuts can be found in this +section.

+ Opens a dialog where you can change your Sword configuration and +manage your bookshelf. Please see this section for details.

Help

diff --git a/docs/handbook/pt-br/html/hdbk-startsequence.html b/docs/handbook/pt-br/html/hdbk-startsequence.html index 7e0e8ae..cfe40f3 100644 --- a/docs/handbook/pt-br/html/hdbk-startsequence.html +++ b/docs/handbook/pt-br/html/hdbk-startsequence.html @@ -1,4 +1,4 @@ -Sequncia de incio

Sequncia de incio

Ao iniciar o BibleTime, voc pode ver as seguintes telas antes da janela +Sequncia de incio

Sequncia de incio

Ao iniciar o BibleTime, voc pode ver as seguintes telas antes da janela principal do BibleTime abrir:

Bookshelf Manager

diff --git a/docs/handbook/pt-br/html/hdbk-term.html b/docs/handbook/pt-br/html/hdbk-term.html index 6f79a71..7b1263d 100644 --- a/docs/handbook/pt-br/html/hdbk-term.html +++ b/docs/handbook/pt-br/html/hdbk-term.html @@ -1,11 +1,10 @@ -Capítulo 2. Iniciando BibleTime

Capítulo 2. Iniciando BibleTime

Como iniciar o BibleTime

Iniciando BibleTime

BibleTime um arquivo executvel integrado ao desktop. Voc pode iniciaro +Capítulo 2. Iniciando BibleTime

Capítulo 2. Iniciando BibleTime

Como iniciar o BibleTime

Iniciando BibleTime

BibleTime um arquivo executvel integrado ao desktop. Voc pode iniciaro BibleTime do menu de incio com esse cone:

cone do BibleTime

BibleTime pode ser iniciado de um terminal de prompt de comando. Para iniciar o BibleTime, abra uma janela do terminal e digite: -

BibleTime

Outros gerenciadores de janelas

BibleTime pode ser usado com outros gerenciadores de janelas como Gnome, -Blackbox, Fluxbox, OpenBox ou Sawfish, contanto que as bibliotecas base -apropriadas j estejam instaladas no seu computador.

Personalizao de incio

De um terminal voc pode usar o BibleTime para abrir um versculo aleatrio -na bblia padro: -

bibletime --open-default-bible
-      "<random>"

Para abrir numa passagem como Joo 3:16, use: -

bibletime --open-default-bible "Joo 3:16"

Voc tambm pode usar os nomes dos livros em seu idioma de nomes atual.

+

bibletime

Personalizao de incio

De um terminal voc pode usar o BibleTime para abrir um versculo aleatrio +na bblia padro: +

bibletime --open-default-bible "<random>"

+ Para abrir numa passagem como Joo 3:16, use: +

bibletime --open-default-bible "Joo 3:16"

+ Voc tambm pode usar os nomes dos livros em seu idioma de nomes atual.

diff --git a/docs/handbook/pt-br/html/index.html b/docs/handbook/pt-br/html/index.html index e480cf5..ebb82ad 100644 --- a/docs/handbook/pt-br/html/index.html +++ b/docs/handbook/pt-br/html/index.html @@ -1,11 +1,11 @@ -O livro de mo do BibleTime

O livro de mo do BibleTime

Fred Saalbach

Jeffrey Hoyt

Martin Gruner

Thomas Abthorpe

2.3

O livro de mo do BibleTime parte do BibleTime.

Resumo

BibleTime uma ferramenta de estudo da Bblia baseado no framework Sword.


Índice

1. Introduo
Sobre BibleTime
Obras disponveis
Motivao
2. Iniciando BibleTime
Como iniciar o BibleTime
Iniciando BibleTime
Outros gerenciadores de janelas
Personalizao de incio
Sequncia de incio
3. Operao do programa
Viso geral do programa
Partes da janela de aplicao do BibleTime
A Estante de Livros
A Lupa
A Mesa
Buscando em obras
Procurando texto em uma janela de leitura aberta
Acessando o dilogo de busca
Configurao de pesquisa
Resultados de busca
O Gerenciador da Estante
Configurao do(s) caminho(s) da Estante
Instalar/atualizar obra(s)
Remover obra(s)
ndices de pesquisa
Exportando e Imprimindo
4. Configurando BibleTime
Dilogo de configurao do BibleTime
+O livro de mo do BibleTime +
Works reference
Shortcuts index

Lista de Tabelas

3.1. Tipos de Busca
4.1. Fontes Unicode
diff --git a/docs/howto/bg/html/h2-basics-approaches.html b/docs/howto/bg/html/h2-basics-approaches.html index b15bebc..c70b01d 100644 --- a/docs/howto/bg/html/h2-basics-approaches.html +++ b/docs/howto/bg/html/h2-basics-approaches.html @@ -1,4 +1,4 @@ -Подходи към Божието Слово

Подходи към Божието Слово

Hearing and reading provide a telescopic view of the scripture while study +Подходи към Божието Слово

Подходи към Божието Слово

Hearing and reading provide a telescopic view of the scripture while study and memorization provide a microscopic view of scripture. Meditating on the scriptures brings hearing, reading, studying and memorization together and cements the word in our minds.

Слушане

Lk.11:28 blessed are those who hear the word of God, and observe diff --git a/docs/howto/bg/html/h2-basics-expository.html b/docs/howto/bg/html/h2-basics-expository.html index e8e0dc2..c5a1dd6 100644 --- a/docs/howto/bg/html/h2-basics-expository.html +++ b/docs/howto/bg/html/h2-basics-expository.html @@ -1,4 +1,4 @@ -Примерно изучаване на Матея 6:1-18

Примерно изучаване на Матея 6:1-18

Let's study together Mt.6:1-18. Read it to yourself, first looking for the +Примерно изучаване на Матея 6:1-18

Примерно изучаване на Матея 6:1-18

Let's study together Mt.6:1-18. Read it to yourself, first looking for the key verse, the verse that sums up the whole passage. Think you have it? Test it by picking different places in the passage and asking yourself if they relate to the thought of the key verse. Once you find it, write it as diff --git a/docs/howto/bg/html/h2-basics-interpretation.html b/docs/howto/bg/html/h2-basics-interpretation.html index 1c063d9..949fced 100644 --- a/docs/howto/bg/html/h2-basics-interpretation.html +++ b/docs/howto/bg/html/h2-basics-interpretation.html @@ -1,4 +1,4 @@ -Основи на правилното интерпретиране

Основи на правилното интерпретиране

Съдържание

Какво точно се казва? Какво се казва на оригиналния език? Внимавайте с +Основи на правилното интерпретиране

Основи на правилното интерпретиране

Съдържание

Какво точно се казва? Какво се казва на оригиналния език? Внимавайте с дефинициите. Не четете това, което не е написано!

Контекст

What do the verses around it say? "Context is king" is the rule -- the passage must make sense within the structure of the entire passage and book.

Препратки

Какво се казва в други стихове по тази тема? Бог никога не си противоречи, diff --git a/docs/howto/bg/html/h2-basics-types.html b/docs/howto/bg/html/h2-basics-types.html index 7d5b34f..0f795e8 100644 --- a/docs/howto/bg/html/h2-basics-types.html +++ b/docs/howto/bg/html/h2-basics-types.html @@ -1,3 +1,3 @@ -Начини за изучаване на Библията

Начини за изучаване на Библията

Тематично изучаване

Изберете си определена тема и я следвайте, като използвате препратките или +Начини за изучаване на Библията

Начини за изучаване на Библията

Тематично изучаване

Изберете си определена тема и я следвайте, като използвате препратките или конкорданс.

Изучаване на герои

Изучаване на живота на определен библейски герой. Например: живота на Йосиф (Бит. 37-50)

Изследване

Изучаване на определен пасаж, параграф, глава или книга.

diff --git a/docs/howto/bg/html/h2-basics-worksheet.html b/docs/howto/bg/html/h2-basics-worksheet.html index e0d8c99..658d8e0 100644 --- a/docs/howto/bg/html/h2-basics-worksheet.html +++ b/docs/howto/bg/html/h2-basics-worksheet.html @@ -1,4 +1,4 @@ -Как да използваме конкорданс?

Как да използваме конкорданс?

За да намерим определен стих

  1. Изберете си ключова дума от стиха или дума, която не е често срещана.

  2. Намерете тази дума по азбучен ред

  3. Под думата има списък от стихове, сред които е търсеният...

Find these verses: +Как да използваме конкорданс?

Как да използваме конкорданс?

За да намерим определен стих

  1. Изберете си ключова дума от стиха или дума, която не е често срещана.

  2. Намерете тази дума по азбучен ред

  3. Под думата има списък от стихове, сред които е търсеният...

Find these verses:

  1. Faithful are the wounds of a friend

  2. We are ambassadors of Christ.

  3. The story of the rich man and Lazarus.

За да проследим тема

Let's say you wanted to do a study of the word "redemption." First you would look up that word in the concordance and look up references listed diff --git a/docs/howto/bg/html/h2-basics.html b/docs/howto/bg/html/h2-basics.html index 5b4ae48..d1d1b4a 100644 --- a/docs/howto/bg/html/h2-basics.html +++ b/docs/howto/bg/html/h2-basics.html @@ -1,4 +1,4 @@ -Глава 2. Основи на изучаването на Библията

Глава 2. Основи на изучаването на Библията

Целта на изучаването

+Глава 2. Основи на изучаването на Библията

Глава 2. Основи на изучаването на Библията

Целта на изучаването

 

You search the Scriptures, because you think that in them you have eternal life; and it is these that bear witness of Me; and you are unwilling to come to Me, that you may have life.

 
 --Jn.5:39-40

diff --git a/docs/howto/bg/html/h2-importance-breathed.html b/docs/howto/bg/html/h2-importance-breathed.html index 6161344..0e04f0b 100644 --- a/docs/howto/bg/html/h2-importance-breathed.html +++ b/docs/howto/bg/html/h2-importance-breathed.html @@ -1,4 +1,4 @@ -Книга, която е боговдъхновена

Книга, която е боговдъхновена

Heb.4:12 "For the word of God is living and +Книга, която е боговдъхновена

Книга, която е боговдъхновена

Heb.4:12 "For the word of God is living and active... " Jesus said (Mt.4:4), "It is written, Man shall not live on bread alone, but on every word that proceeds [lit., is proceeding] from the mouth of God." diff --git a/docs/howto/bg/html/h2-importance-exhortations.html b/docs/howto/bg/html/h2-importance-exhortations.html index f3ba49f..bb26dbe 100644 --- a/docs/howto/bg/html/h2-importance-exhortations.html +++ b/docs/howto/bg/html/h2-importance-exhortations.html @@ -1,4 +1,4 @@ -Съвети

Съвети

+Съвети

Съвети

2 Тим. 2:15 казва: "Старай се да се представиш одобрен пред Бога работник, който няма от що да се срамува, като излагаш право словото на истината." diff --git a/docs/howto/bg/html/h2-importance-liberates.html b/docs/howto/bg/html/h2-importance-liberates.html index 8320a2f..608aa36 100644 --- a/docs/howto/bg/html/h2-importance-liberates.html +++ b/docs/howto/bg/html/h2-importance-liberates.html @@ -1,4 +1,4 @@ -Книга, която дарява свобода

Книга, която дарява свобода

+Книга, която дарява свобода

Книга, която дарява свобода

Jn.8:32 "and you shall know the truth, and the truth shall make you free."This is usually quoted by itself. Is this a conditional or unconditional promise? Would it apply to all kinds of diff --git a/docs/howto/bg/html/h2-importance-once.html b/docs/howto/bg/html/h2-importance-once.html index 8404c3a..d3c2523 100644 --- a/docs/howto/bg/html/h2-importance-once.html +++ b/docs/howto/bg/html/h2-importance-once.html @@ -1,4 +1,4 @@ -Допълнение: "Веднъж завинаги"

Допълнение: "Веднъж завинаги"

 

The truth regarding the finality of God's initiative in Christ is conveyed +Допълнение: "Веднъж завинаги"

Допълнение: "Веднъж завинаги"

 

The truth regarding the finality of God's initiative in Christ is conveyed by one word of the Greek Testament, namely the adverb hapax and ephapax. It is usually translated in the diff --git a/docs/howto/bg/html/h2-importance-supplement.html b/docs/howto/bg/html/h2-importance-supplement.html index 2cd91af..9250cfe 100644 --- a/docs/howto/bg/html/h2-importance-supplement.html +++ b/docs/howto/bg/html/h2-importance-supplement.html @@ -1,4 +1,4 @@ -Послеслов: Програми за четене на Библията

Послеслов: Програми за четене на Библията

Here are some easy programs to systematically read your Bible. You can do +Послеслов: Програми за четене на Библията

Послеслов: Програми за четене на Библията

Here are some easy programs to systematically read your Bible. You can do more than one at a time if you like, for instance #1 with #4, or #2 with #5. Vary the program from year to year to keep it fresh!

  1. Новият Завет за една година: четете по една глава всеки работен ден.

  2. Притчи за месец: четете по една глава от Притчи всеки ден (например главата, diff --git a/docs/howto/bg/html/h2-importance-wars.html b/docs/howto/bg/html/h2-importance-wars.html index 10eec5d..6f306c7 100644 --- a/docs/howto/bg/html/h2-importance-wars.html +++ b/docs/howto/bg/html/h2-importance-wars.html @@ -1,2 +1,2 @@ -Книга за духовното воюване

    Книга за духовното воюване

    +Книга за духовното воюване

    Книга за духовното воюване

    Еф. 6:10 дава представа за духовното ни всеоръжие.

    Таблица 1.3. Духовната броня

    ВъпросОтговор
    Колко от изброените предмети служат за защита?5
    Колко - за нападение?One
    Кое? Словото - rhema

    diff --git a/docs/howto/bg/html/h2-importance-works.html b/docs/howto/bg/html/h2-importance-works.html index 83f80e2..9d74971 100644 --- a/docs/howto/bg/html/h2-importance-works.html +++ b/docs/howto/bg/html/h2-importance-works.html @@ -1,4 +1,4 @@ -Книга, която е действена

    Книга, която е действена

    +Книга, която е действена

    Книга, която е действена

    С какво би ви помогнало изучаването на Библията? 1 Солунци 2:13 казва, че Библията "действува между вас, вярващите". Нека разгледаме някои стихове и видим как Божието Слово действа. diff --git a/docs/howto/bg/html/h2-importance.html b/docs/howto/bg/html/h2-importance.html index 1116935..d77bcc3 100644 --- a/docs/howto/bg/html/h2-importance.html +++ b/docs/howto/bg/html/h2-importance.html @@ -1,4 +1,4 @@ -Глава 1. Важността на Божието Слово

    Глава 1. Важността на Божието Слово

    Understanding God's word is of great importance to all who call on God's +Глава 1. Важността на Божието Слово

    Глава 1. Важността на Божието Слово

    Understanding God's word is of great importance to all who call on God's name. Study of the Bible is one of the primary ways that we learn to communicate with God.

    Книга, която е уникална

    The Bible stands alone in many ways. It is unique in: